]> git.ipfire.org Git - thirdparty/git.git/commit
projects / thirdparty / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 3f94ff7) | patch
difftool: add '--no-gui' option
authorTim Henigan <tim.henigan@gmail.com>
Thu, 22 Mar 2012 19:52:17 +0000 (15:52 -0400)
committerJunio C Hamano <gitster@pobox.com>
Fri, 23 Mar 2012 18:46:25 +0000 (11:46 -0700)
commit850896042a42c1c16912a3981ca844e2cbcd14d4
treef38da913cd54a31969bff0381abbbc12642b8249tree | snapshot
parent3f94ff755e266520ba2f6007d557395c33d30fdccommit | diff
difftool: add '--no-gui' option

This commit teaches difftool to handle the '--no-gui' option. This option
negates the existing '--gui' option. The last setting given on the command
line wins.

This allows a user to configure "[alias] mdt = difftool --gui", but still
have the ability to override the setting without error:

$ git mdt --no-gui

Signed-off-by: Tim Henigan <tim.henigan@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
git-difftool.perl diff | blob | blame | history
t/t7800-difftool.sh diff | blob | blame | history
Unnamed repository; edit this file 'description' to name the repository.