From: Johannes Schindelin <Johannes.Schindelin@gmx.de>
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 15:49:06 +0100 (STD) [thread overview]
Message-ID: <nycvar.QRO.7.76.6.1803191548080.55@ZVAVAG-6OXH6DA.rhebcr.pbec.zvpebfbsg.pbz> (raw)
In-Reply-To: <20180317033142.20119-2-david.pursehouse@gmail.com>
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
next prev parent reply other threads:[~2018-03-19 14:49 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 [this message]
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
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=nycvar.QRO.7.76.6.1803191548080.55@ZVAVAG-6OXH6DA.rhebcr.pbec.zvpebfbsg.pbz \
--to=johannes.schindelin@gmx.de \
--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).