| commit | e4d15959d45468bfb13c80195e3a6b40f5b0a489 | |
| author | Junio C Hamano <gitster@pobox.com> | |
| Wed, 24 Apr 2013 23:17:13 +0000 (24 16:17 -0700) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Wed, 24 Apr 2013 23:19:42 +0000 (24 16:19 -0700) | ||
| tree | 847ff7ecdecbd5b4babe51cc57354a6b2d4f6091 | treesnapshot (tar.gz zip) |
| parent | 283c63fac2c76deda2058f03000e18fb35d44fb6 | commitdiff |
| parent | 0895c6d4c09045a3faeb7b652a844fc81c774631 | commitdiff |
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
"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
| diff.c | diff1 | diff2 | blobhistory |