From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 19 Mar 2018 16:51:14 GMT
Subject: Re: [PATCH 1/1] Fix typo in merge-strategies documentation
Message-ID: <xmqqo9jkvwjh.fsf@gitster-ct.c.googlers.com>
In-Reply-To: <20180317033142.20119-2-david.pursehouse@gmail.com>

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