| commit | 825ccfc23c7834152323586d8470666315dd4347 | |
| author | Junio C Hamano <gitster@pobox.com> | |
| Mon, 15 Apr 2013 19:40:58 +0000 (15 12:40 -0700) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Mon, 15 Apr 2013 19:40:58 +0000 (15 12:40 -0700) | ||
| tree | 167d5ec8fee33505252fd7dd76fa6bdeadf972ee | treesnapshot (tar.gz zip) |
| parent | 948cf4f5e546876cade022640873f92dbc2de1ee | commitdiff |
| parent | 0895c6d4c09045a3faeb7b652a844fc81c774631 | commitdiff |
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
"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
| diff.c | diff1 | diff2 | blobhistory |