diff options
| author | John Keeping <john@keeping.me.uk> | 2013-04-05 12:37:30 +0100 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2013-04-05 10:57:23 -0700 |
| commit | 4db4f0fba43d7e9b9b87a3a40d85ffbdfcef2884 (patch) | |
| tree | 02b500e030471bbaddeebcee9d39ef0286f9ad51 /Documentation/merge-strategies.txt | |
| parent | 07924d4d50e5304fb53eb60aaba8aef31d4c4e5e (diff) | |
| download | git-4db4f0fba43d7e9b9b87a3a40d85ffbdfcef2884.tar.gz | |
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.txt | 6 |
1 files changed, 6 insertions, 0 deletions
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;; |