| commit | af83b2bb9a71eae53b4b8e058b31a834da6cc7e0 | |
| author | Junio C Hamano <gitster@pobox.com> | |
| Thu, 11 Apr 2013 23:15:38 +0000 (11 16:15 -0700) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Thu, 11 Apr 2013 23:15:39 +0000 (11 16:15 -0700) | ||
| tree | 5b236205bcae82da27576ff8b6e9bbdb1f2ace90 | treesnapshot (tar.gz zip) |
| parent | f131fb6eb2a1e09f7ce53d148e21ce6960f42422 | commitdiff |
| parent | 0895c6d4c09045a3faeb7b652a844fc81c774631 | commitdiff |
Merge branch 'jk/diff-algo-finishing-touches' into next
"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 |