]> git.ipfire.org Git - thirdparty/git.git/commit - builtin/difftool.c
projects / thirdparty / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 60aced3) | patch
difftool: make --gui, --tool and --extcmd mutually exclusive
authorDenton Liu <liu.denton@gmail.com>
Mon, 29 Apr 2019 06:21:17 +0000 (02:21 -0400)
committerJunio C Hamano <gitster@pobox.com>
Mon, 13 May 2019 14:11:59 +0000 (23:11 +0900)
commit7f978d7d10a87c4a56ea3101b936cddb25bbe2c6
treea974ee6fc7fc745081d5a2e90e570fc0247b295ftree | snapshot
parent60aced3dfa68df60952fed28c4ae63a5bbda0275commit | diff
difftool: make --gui, --tool and --extcmd mutually exclusive

In git-difftool, these options specify which tool to ultimately run. As
a result, they are logically conflicting. Explicitly disallow these
options from being used together.

Signed-off-by: Denton Liu <liu.denton@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
builtin/difftool.c diff | blob | blame | history
t/t7800-difftool.sh diff | blob | blame | history
Unnamed repository; edit this file 'description' to name the repository.