Andrew's git
/
gitweb.git
/ diff
summary
|
log
|
commit
| diff |
tree
commit
grep
author
committer
pickaxe
?
re
docs/merge-strategies: remove hyphen from mis-merges
author
Albert L. Lash, IV
<alash3@bloomberg.net>
Sat, 8 Feb 2014 20:41:34 +0000
(15:41 -0500)
committer
Junio C Hamano
<gitster@pobox.com>
Tue, 11 Feb 2014 19:02:59 +0000
(11:02 -0800)
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>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Documentation/merge-strategies.txt
patch
|
blob
|
history
raw
|
patch
| inline |
side by side
(parent:
6a70719
)
diff --git
a/Documentation/merge-strategies.txt
b/Documentation/merge-strategies.txt
index fb6e593e7c6f287612f30be6206c0492d77e38d3..350949810e224c9963278cbc73351011448e9b56 100644
(file)
--- 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