| commit | fab4a8a39666793d407371f519e8b6d25d33fa84 | |
| author | Junio C Hamano <gitster@pobox.com> | |
| Sun, 19 May 2019 07:45:35 +0000 (19 16:45 +0900) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Sun, 19 May 2019 07:45:35 +0000 (19 16:45 +0900) | ||
| tree | ea8851107dda1a726b3eec91d347996ead1ab683 | treesnapshot (tar.gz zip) |
| parent | 8c59ba9a764f1ae1f8d176ea17c636183cfd7267 | commitdiff |
| parent | f3a3a021c716b46ed35e6b7171bbff4d8042da68 | commitdiff |
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)
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)
| builtin/difftool.c | diff1 | diff2 | blobhistory |