summaryrefslogtreecommitdiff
path: root/Documentation/merge-strategies.txt
diff options
context:
space:
mode:
authorJohn Keeping <john@keeping.me.uk>2013-04-05 11:37:30 (GMT)
committerJunio C Hamano <gitster@pobox.com>2013-04-05 17:57:23 (GMT)
commit4db4f0fba43d7e9b9b87a3a40d85ffbdfcef2884 (patch)
tree02b500e030471bbaddeebcee9d39ef0286f9ad51 /Documentation/merge-strategies.txt
parent07924d4d50e5304fb53eb60aaba8aef31d4c4e5e (diff)
downloadgit-4db4f0fba43d7e9b9b87a3a40d85ffbdfcef2884.zip
git-4db4f0fba43d7e9b9b87a3a40d85ffbdfcef2884.tar.gz
git-4db4f0fba43d7e9b9b87a3a40d85ffbdfcef2884.tar.bz2
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>
Diffstat (limited to 'Documentation/merge-strategies.txt')
-rw-r--r--Documentation/merge-strategies.txt6
1 files changed, 6 insertions, 0 deletions
diff --git a/Documentation/merge-strategies.txt b/Documentation/merge-strategies.txt
index 66db802..49a9a7d 100644
--- a/Documentation/merge-strategies.txt
+++ b/Documentation/merge-strategies.txt
@@ -48,6 +48,12 @@ patience;;
this when the branches to be merged have diverged wildly.
See also linkgit:git-diff[1] `--patience`.
+diff-algorithm=[patience|minimal|histogram|myers];;
+ Tells 'merge-recursive' to use a different diff algorithm, which
+ can help avoid mismerges that occur due to unimportant matching
+ lines (such as braces from distinct functions). See also
+ linkgit:git-diff[1] `--diff-algorithm`.
+
ignore-space-change;;
ignore-all-space;;
ignore-space-at-eol;;