From: David Pursehouse <david.pursehouse@gmail.com>
To: git@vger.kernel.org
Cc: David Pursehouse <dpursehouse@collab.net>
Subject: [PATCH 1/1] Fix typo in merge-strategies documentation
Date: Sat, 17 Mar 2018 12:31:42 +0900 [thread overview]
Message-ID: <20180317033142.20119-2-david.pursehouse@gmail.com> (raw)
In-Reply-To: <20180317033142.20119-1-david.pursehouse@gmail.com>
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
next prev parent reply other threads:[~2018-03-17 3:31 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 ` David Pursehouse [this message]
2018-03-19 14:49 ` [PATCH 1/1] " 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
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
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20180317033142.20119-2-david.pursehouse@gmail.com \
--to=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.
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 NNTP newsgroup(s).