diff options
| author | Junio C Hamano <gitster@pobox.com> | 2013-04-15 19:40:58 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2013-04-15 19:40:58 (GMT) |
| commit | 825ccfc23c7834152323586d8470666315dd4347 (patch) | |
| tree | 167d5ec8fee33505252fd7dd76fa6bdeadf972ee /Documentation | |
| parent | 948cf4f5e546876cade022640873f92dbc2de1ee (diff) | |
| parent | 0895c6d4c09045a3faeb7b652a844fc81c774631 (diff) | |
| download | git-825ccfc23c7834152323586d8470666315dd4347.zip git-825ccfc23c7834152323586d8470666315dd4347.tar.gz git-825ccfc23c7834152323586d8470666315dd4347.tar.bz2 | |
Merge branch 'jk/diff-algo-finishing-touches'
"git diff --diff-algorithm algo" is also understood as "git diff
--diff-algorithm=algo".
* jk/diff-algo-finishing-touches:
diff: allow unstuck arguments with --diff-algorithm
git-merge(1): document diff-algorithm option to merge-recursive
Diffstat (limited to 'Documentation')
| -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 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;; |