git-merge(1): document diff-algorithm option to merge-recursive
Commit 07924d4 (diff: Introduce --diff-algorithm command line option 2013-01-16) added diff-algorithm as a parameter to the recursive merge strategy but did not document it. Do so. Signed-off-by: John Keeping <john@keeping.me.uk> Signed-off-by: Junio C Hamano <gitster@pobox.com>
John Keeping committed
Apr 5, 2013 at 12:37 UTC
4db4f0fba43d7e9b9b87a3a40d85ffbdfcef2884
1 file changed
+6
Documentation/merge-strategies.txt
+6
@@ -48,6 +48,12 @@ patience;;
48
this when the branches to be merged have diverged wildly.
49
See also linkgit:git-diff[1] `--patience`.
50
51
+diff-algorithm=[patience|minimal|histogram|myers];;
52
+ Tells 'merge-recursive' to use a different diff algorithm, which
53
+ can help avoid mismerges that occur due to unimportant matching
54
+ lines (such as braces from distinct functions). See also
55
+ linkgit:git-diff[1] `--diff-algorithm`.
56
+
57
ignore-space-change;;
58
ignore-all-space;;
59
ignore-space-at-eol;;