diff options
| author | Junio C Hamano <gitster@pobox.com> | 2013-04-24 16:17:13 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2013-04-24 16:19:42 -0700 |
| commit | e4d15959d45468bfb13c80195e3a6b40f5b0a489 (patch) | |
| tree | 847ff7ecdecbd5b4babe51cc57354a6b2d4f6091 /Documentation | |
| parent | 283c63fac2c76deda2058f03000e18fb35d44fb6 (diff) | |
| parent | 0895c6d4c09045a3faeb7b652a844fc81c774631 (diff) | |
| download | git-e4d15959d45468bfb13c80195e3a6b40f5b0a489.tar.gz | |
Merge branch 'jk/diff-algo-finishing-touches' into maint
"git diff --diff-algorithm=algo" was understood by the command line
parser, but "git diff --diff-algorithm algo" was not.
* 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 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;; |