From: Junio C Hamano <gitster@pobox.com>
Date: Tue, 25 Mar 2014 18:08:23 +0000 (-0700)
Subject: Merge branch 'rr/doc-merge-strategies'
X-Git-Tag: v2.0.0-rc0~63
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/3e33860aa1c39429ebfe2542adf9011bd2c9aeba?ds=inline;hp=-c

Merge branch 'rr/doc-merge-strategies'

* rr/doc-merge-strategies:
Documentation/merge-strategies: avoid hyphenated commands
---

3e33860aa1c39429ebfe2542adf9011bd2c9aeba
diff --combined Documentation/merge-strategies.txt
index 350949810e,81e349309c..7bbd19b300
--- a/Documentation/merge-strategies.txt
+++ b/Documentation/merge-strategies.txt
@@@ -1,10 -1,10 +1,10 @@@
  MERGE STRATEGIES
  ----------------
  
- The merge mechanism ('git-merge' and 'git-pull' commands) allows the
+ The merge mechanism (`git merge` and `git pull` commands) allows the
  backend 'merge strategies' to be chosen with `-s` option.  Some strategies
  can also take their own options, which can be passed by giving `-X<option>`
- arguments to 'git-merge' and/or 'git-pull'.
+ arguments to `git merge` and/or `git pull`.
  
  resolve::
  	This can only resolve two heads (i.e. the current branch
@@@ -20,7 -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
@@@ -113,11 -113,3 +113,11 @@@ subtree:
  	match the tree structure of A, instead of reading the trees at
  	the same level. This adjustment is also done to the common
  	ancestor tree.
 +
 +With the strategies that use 3-way merge (including the default, 'recursive'),
 +if a change is made on both branches, but later reverted on one of the
 +branches, that change will be present in the merged result; some people find
 +this behavior confusing.  It occurs because only the heads and the merge base
 +are considered when performing a merge, not the individual commits.  The merge
 +algorithm therefore considers the reverted change as no change at all, and
 +substitutes the changed version instead.