* [PATCH 0/1] Fix typo in merge-strategies documentation
@ 2018-03-17 3:31 David Pursehouse
2018-03-17 3:31 ` [PATCH 1/1] " David Pursehouse
0 siblings, 1 reply; 7+ messages in thread
From: David Pursehouse @ 2018-03-17 3:31 UTC (permalink / raw)
To: git; +Cc: David Pursehouse
From: David Pursehouse <dpursehouse@collab.net>
Fixes a minor typo in the merge-strategies documentation.
David Pursehouse (1):
Fix typo in merge-strategies documentation
Documentation/merge-strategies.txt | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--
2.16.2
^ permalink raw reply [flat|nested] 7+ messages in thread
* [PATCH 1/1] Fix typo in merge-strategies documentation
2018-03-17 3:31 [PATCH 0/1] Fix typo in merge-strategies documentation David Pursehouse
@ 2018-03-17 3:31 ` David Pursehouse
2018-03-19 14:49 ` Johannes Schindelin
2018-03-19 16:51 ` Junio C Hamano
0 siblings, 2 replies; 7+ messages in thread
From: David Pursehouse @ 2018-03-17 3:31 UTC (permalink / raw)
To: git; +Cc: David Pursehouse
From: David Pursehouse <dpursehouse@collab.net>
Signed-off-by: David Pursehouse <dpursehouse@collab.net>
---
Documentation/merge-strategies.txt | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Documentation/merge-strategies.txt b/Documentation/merge-strategies.txt
index fd5d748d1..4a58aad4b 100644
--- a/Documentation/merge-strategies.txt
+++ b/Documentation/merge-strategies.txt
@@ -40,7 +40,7 @@ the other tree did, declaring 'our' history contains all that happened in it.
theirs;;
This is the opposite of 'ours'; note that, unlike 'ours', there is
- no 'theirs' merge stragegy to confuse this merge option with.
+ no 'theirs' merge strategy to confuse this merge option with.
patience;;
With this option, 'merge-recursive' spends a little extra time
--
2.16.2
^ permalink raw reply related [flat|nested] 7+ messages in thread
* Re: [PATCH 1/1] Fix typo in merge-strategies documentation
2018-03-17 3:31 ` [PATCH 1/1] " David Pursehouse
@ 2018-03-19 14:49 ` Johannes Schindelin
2018-03-19 16:51 ` Junio C Hamano
1 sibling, 0 replies; 7+ messages in thread
From: Johannes Schindelin @ 2018-03-19 14:49 UTC (permalink / raw)
To: David Pursehouse; +Cc: git, David Pursehouse
Hi David,
On Sat, 17 Mar 2018, David Pursehouse wrote:
> diff --git a/Documentation/merge-strategies.txt b/Documentation/merge-strategies.txt
> index fd5d748d1..4a58aad4b 100644
> --- a/Documentation/merge-strategies.txt
> +++ b/Documentation/merge-strategies.txt
> @@ -40,7 +40,7 @@ the other tree did, declaring 'our' history contains all that happened in it.
>
> theirs;;
> This is the opposite of 'ours'; note that, unlike 'ours', there is
> - no 'theirs' merge stragegy to confuse this merge option with.
> + no 'theirs' merge strategy to confuse this merge option with.
Well spotted: it is `strategy`, not `stragegy` (nor `stragedy`, I might
want to add :-))
I just verified that there is no other hit in `git grep stragegy`'s
output.
Thanks,
Johannes
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [PATCH 1/1] Fix typo in merge-strategies documentation
2018-03-17 3:31 ` [PATCH 1/1] " David Pursehouse
2018-03-19 14:49 ` Johannes Schindelin
@ 2018-03-19 16:51 ` Junio C Hamano
2018-03-21 22:31 ` Johannes Schindelin
2018-03-21 23:50 ` David Pursehouse
1 sibling, 2 replies; 7+ messages in thread
From: Junio C Hamano @ 2018-03-19 16:51 UTC (permalink / raw)
To: David Pursehouse; +Cc: git, David Pursehouse
David Pursehouse <david.pursehouse@gmail.com> writes:
> From: David Pursehouse <dpursehouse@collab.net>
>
> Signed-off-by: David Pursehouse <dpursehouse@collab.net>
> ---
I somehow had to stare at the patch for a few minutes, view it in
two Emacs buffers and run M-x compare-windows before I finally spot
the single-byte typofix.
Will queue with a retitle.
Documentation/merge-strategies: typofix
It's strategy, not stragegy.
Signed-off-by: David Pursehouse <dpursehouse@collab.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Thanks.
> Documentation/merge-strategies.txt | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/Documentation/merge-strategies.txt b/Documentation/merge-strategies.txt
> index fd5d748d1..4a58aad4b 100644
> --- a/Documentation/merge-strategies.txt
> +++ b/Documentation/merge-strategies.txt
> @@ -40,7 +40,7 @@ the other tree did, declaring 'our' history contains all that happened in it.
>
> theirs;;
> This is the opposite of 'ours'; note that, unlike 'ours', there is
> - no 'theirs' merge stragegy to confuse this merge option with.
> + no 'theirs' merge strategy to confuse this merge option with.
>
> patience;;
> With this option, 'merge-recursive' spends a little extra time
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [PATCH 1/1] Fix typo in merge-strategies documentation
2018-03-19 16:51 ` Junio C Hamano
@ 2018-03-21 22:31 ` Johannes Schindelin
2018-03-22 16:34 ` Junio C Hamano
2018-03-21 23:50 ` David Pursehouse
1 sibling, 1 reply; 7+ messages in thread
From: Johannes Schindelin @ 2018-03-21 22:31 UTC (permalink / raw)
To: Junio C Hamano; +Cc: David Pursehouse, git, David Pursehouse
Hi Junio,
On Mon, 19 Mar 2018, Junio C Hamano wrote:
> David Pursehouse <david.pursehouse@gmail.com> writes:
>
> > From: David Pursehouse <dpursehouse@collab.net>
> >
> > Signed-off-by: David Pursehouse <dpursehouse@collab.net>
> > ---
>
> I somehow had to stare at the patch for a few minutes, view it in
> two Emacs buffers and run M-x compare-windows before I finally spot
> the single-byte typofix.
Pro-tip: git am && git show --color-words
:-)
Ciao,
Dscho
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [PATCH 1/1] Fix typo in merge-strategies documentation
2018-03-21 22:31 ` Johannes Schindelin
@ 2018-03-22 16:34 ` Junio C Hamano
0 siblings, 0 replies; 7+ messages in thread
From: Junio C Hamano @ 2018-03-22 16:34 UTC (permalink / raw)
To: Johannes Schindelin; +Cc: David Pursehouse, git, David Pursehouse
Johannes Schindelin <Johannes.Schindelin@gmx.de> writes:
> On Mon, 19 Mar 2018, Junio C Hamano wrote:
>
>> David Pursehouse <david.pursehouse@gmail.com> writes:
>>
>> > From: David Pursehouse <dpursehouse@collab.net>
>> >
>> > Signed-off-by: David Pursehouse <dpursehouse@collab.net>
>> > ---
>>
>> I somehow had to stare at the patch for a few minutes, view it in
>> two Emacs buffers and run M-x compare-windows before I finally spot
>> the single-byte typofix.
>
> Pro-tip: git am && git show --color-words
Yeah, I know, but that would not work while I am wondering if the
patch is worth applying in the first place ;-)
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [PATCH 1/1] Fix typo in merge-strategies documentation
2018-03-19 16:51 ` Junio C Hamano
2018-03-21 22:31 ` Johannes Schindelin
@ 2018-03-21 23:50 ` David Pursehouse
1 sibling, 0 replies; 7+ messages in thread
From: David Pursehouse @ 2018-03-21 23:50 UTC (permalink / raw)
To: Junio C Hamano; +Cc: git, David Pursehouse
On Tue, Mar 20, 2018 at 1:51 AM, Junio C Hamano <gitster@pobox.com> wrote:
>
> I somehow had to stare at the patch for a few minutes, view it in
> two Emacs buffers and run M-x compare-windows before I finally spot
> the single-byte typofix.
>
> Will queue with a retitle.
[resending as plain text]
Thanks, and sorry for the confusion. I'll provide a more detailed
commit message next time.
^ permalink raw reply [flat|nested] 7+ messages in thread
end of thread, other threads:[~2018-03-22 16:35 UTC | newest]
Thread overview: 7+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2018-03-17 3:31 [PATCH 0/1] Fix typo in merge-strategies documentation David Pursehouse
2018-03-17 3:31 ` [PATCH 1/1] " David Pursehouse
2018-03-19 14:49 ` Johannes Schindelin
2018-03-19 16:51 ` Junio C Hamano
2018-03-21 22:31 ` Johannes Schindelin
2018-03-22 16:34 ` Junio C Hamano
2018-03-21 23:50 ` David Pursehouse
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).