git@vger.kernel.org mailing list mirror (one of many)
 help / color / mirror / code / Atom feed
From: Junio C Hamano <gitster@pobox.com>
To: David Pursehouse <david.pursehouse@gmail.com>
Cc: git@vger.kernel.org, David Pursehouse <dpursehouse@collab.net>
Subject: Re: [PATCH 1/1] Fix typo in merge-strategies documentation
Date: Mon, 19 Mar 2018 09:51:14 -0700	[thread overview]
Message-ID: <xmqqo9jkvwjh.fsf@gitster-ct.c.googlers.com> (raw)
In-Reply-To: <20180317033142.20119-2-david.pursehouse@gmail.com> (David Pursehouse's message of "Sat, 17 Mar 2018 12:31:42 +0900")

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

  parent reply	other threads:[~2018-03-19 16:51 UTC|newest]

Thread overview: 7+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
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 [this message]
2018-03-21 22:31     ` Johannes Schindelin
2018-03-22 16:34       ` Junio C Hamano
2018-03-21 23:50     ` David Pursehouse

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

  List information: http://vger.kernel.org/majordomo-info.html

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=xmqqo9jkvwjh.fsf@gitster-ct.c.googlers.com \
    --to=gitster@pobox.com \
    --cc=david.pursehouse@gmail.com \
    --cc=dpursehouse@collab.net \
    --cc=git@vger.kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
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).