diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2019-05-19 16:45:35 +0900 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2019-05-19 16:45:35 +0900 |
| commit | fab4a8a39666793d407371f519e8b6d25d33fa84 (patch) | |
| tree | ea8851107dda1a726b3eec91d347996ead1ab683 /t/t5100/info0006 | |
| parent | Merge branch 'jk/get-oid-indexed-object-name' (diff) | |
| parent | difftool --no-index: error out on --dir-diff (and don't crash) (diff) | |
| download | tgif-fab4a8a39666793d407371f519e8b6d25d33fa84.tar.xz | |
Merge branch 'js/difftool-no-index'
The "--dir-diff" mode of "git difftool" is not useful in "--no-index"
mode; they are now explicitly marked as mutually incompatible.
* js/difftool-no-index:
difftool --no-index: error out on --dir-diff (and don't crash)
Diffstat (limited to 't/t5100/info0006')
0 files changed, 0 insertions, 0 deletions