diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2013-04-15 12:40:58 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2013-04-15 12:40:58 -0700 |
| commit | 825ccfc23c7834152323586d8470666315dd4347 (patch) | |
| tree | 167d5ec8fee33505252fd7dd76fa6bdeadf972ee /Documentation/RelNotes/1.5.5.4.txt | |
| parent | Merge branch 'rt/commentchar-fmt-merge-msg' (diff) | |
| parent | diff: allow unstuck arguments with --diff-algorithm (diff) | |
| download | tgif-825ccfc23c7834152323586d8470666315dd4347.tar.xz | |
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/RelNotes/1.5.5.4.txt')
0 files changed, 0 insertions, 0 deletions