threads / patch / 48062

patchFix typo in merge-strategies documentation

Subject: [PATCH 0/1] Fix typo in merge-strategies documentation

## tl;dr

7 messages between Mar 17, 2018 and Mar 22, 2018. Diffs are folded; open one to read it.

replies: 6people: 3as markdown or json

David Pursehouse· Mar 17, 2018, 03:31 UTC · lore

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

David Pursehouse· Mar 17, 2018, 03:31 UTC · re: David Pursehouse · lore

[PATCH 1/1] Fix typo in merge-strategies documentation

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(-)

Show changes to Documentation/merge-strategies.txt +1 −1

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

Johannes Schindelin· Mar 19, 2018, 14:49 UTC · re: David Pursehouse · lore

Re: [PATCH 1/1] Fix typo in merge-strategies documentation

Hi David,

On Sat, 17 Mar 2018, David Pursehouse wrote:

Show 10 quoted lines

> 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

Junio C Hamano· Mar 19, 2018, 16:51 UTC · re: David Pursehouse · lore

Re: [PATCH 1/1] Fix typo in merge-strategies documentation

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.

Show 16 quoted lines

>  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

Johannes Schindelin· Mar 21, 2018, 22:31 UTC · re: Junio C Hamano · lore

Re: [PATCH 1/1] Fix typo in merge-strategies documentation

Hi Junio,

On Mon, 19 Mar 2018, Junio C Hamano wrote:

Show 10 quoted lines

> 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

Junio C Hamano· Mar 22, 2018, 16:34 UTC · re: Johannes Schindelin · lore

Re: [PATCH 1/1] Fix typo in merge-strategies documentation

Johannes Schindelin <Johannes.Schindelin@gmx.de> writes:

Show 14 quoted lines

> 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 ;-)

David Pursehouse· Mar 21, 2018, 23:50 UTC · re: Junio C Hamano · lore

Re: [PATCH 1/1] Fix typo in merge-strategies documentation

On Tue, Mar 20, 2018 at 1:51 AM, Junio C Hamano <gitster@pobox.com> wrote:

Show 6 quoted lines

>
> 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.