diff options
| author | Junio C Hamano <gitster@pobox.com> | 2013-04-15 13:25:59 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2013-04-15 13:25:59 -0700 |
| commit | 1575c208eda44b1e6c104caef43e5783f9bcd1a9 (patch) | |
| tree | e9941739d40c7e666b0e7d4da0b2c3b697c9c1dc /merge-strategies.txt | |
| parent | a080bc385ebc70fc11db4081c1acc40b529f421f (diff) | |
| download | git-htmldocs-1575c208eda44b1e6c104caef43e5783f9bcd1a9.tar.gz | |
Autogenerated HTML docs for v1.8.2.1-418-gaec3f
Diffstat (limited to 'merge-strategies.txt')
| -rw-r--r-- | merge-strategies.txt | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/merge-strategies.txt b/merge-strategies.txt index 66db80296..49a9a7d53 100644 --- a/merge-strategies.txt +++ b/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;; |