diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2013-06-27 14:30:07 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2013-06-27 14:30:07 -0700 |
| commit | 91fc159745eccb0830c9719642d07617c8100b41 (patch) | |
| tree | 898838ba0c60359f43bcd32ca23cf35a2f44d0bb /Documentation/git-difftool.txt | |
| parent | Merge branch 'rr/cherry-pick-fast-forward-reflog-message' (diff) | |
| parent | add -i: add extra options at the right place in "diff" command line (diff) | |
| download | tgif-91fc159745eccb0830c9719642d07617c8100b41.tar.xz | |
Merge branch 'jk/add-i-custom-diff-algo'
* jk/add-i-custom-diff-algo:
add -i: add extra options at the right place in "diff" command line
add--interactive: respect diff.algorithm
Diffstat (limited to 'Documentation/git-difftool.txt')
0 files changed, 0 insertions, 0 deletions