From 4db4f0fba43d7e9b9b87a3a40d85ffbdfcef2884 Mon Sep 17 00:00:00 2001 From: John Keeping Date: Fri, 5 Apr 2013 12:37:30 +0100 Subject: [PATCH] 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 Signed-off-by: Junio C Hamano --- Documentation/merge-strategies.txt | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/Documentation/merge-strategies.txt b/Documentation/merge-strategies.txt index 66db80296f..49a9a7d53f 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;; -- 2.11.4.GIT