From: "Albert L. Lash, IV" <albert.lash@gmail.com>
To: git@vger.kernel.org
Cc: "Albert L. Lash, IV" <alash3@bloomberg.net>
Subject: [PATCH 1/4] docs/merge-strategies: remove hyphen from mis-merges
Date: Sat, 8 Feb 2014 15:41:34 -0500 [thread overview]
Message-ID: <1391892097-16169-1-git-send-email-alash3@bloomberg.net> (raw)
The term mismerges without hyphen is used a few other
places in the documentation. Let's update this to
be consistent.
Signed-off-by: Albert L. Lash, IV <alash3@bloomberg.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 fb6e593..3509498 100644
--- a/Documentation/merge-strategies.txt
+++ b/Documentation/merge-strategies.txt
@@ -20,7 +20,7 @@ recursive::
merged tree of the common ancestors and uses that as
the reference tree for the 3-way merge. This has been
reported to result in fewer merge conflicts without
- causing mis-merges by tests done on actual merge commits
+ causing mismerges by tests done on actual merge commits
taken from Linux 2.6 kernel development history.
Additionally this can detect and handle merges involving
renames. This is the default merge strategy when
--
1.8.3.2
next reply other threads:[~2014-02-08 20:51 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-02-08 20:41 Albert L. Lash, IV [this message]
2014-02-08 20:41 ` [PATCH 2/4] docs/git-remote: capitalize first word of initial blurb Albert L. Lash, IV
2014-02-08 20:41 ` [PATCH 3/4] docs/git-clone: clarify use of --no-hardlinks option Albert L. Lash, IV
2014-02-11 0:20 ` Junio C Hamano
2014-02-08 20:41 ` [PATCH 4/4] docs/git-blame: explain more clearly the example pickaxe use Albert L. Lash, IV
2014-02-11 0:21 ` Junio C Hamano
2014-02-10 21:06 ` [PATCH 1/4] docs/merge-strategies: remove hyphen from mis-merges Junio C Hamano
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=1391892097-16169-1-git-send-email-alash3@bloomberg.net \
--to=albert.lash@gmail.com \
--cc=alash3@bloomberg.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).