summaryrefslogtreecommitdiff
path: root/git-difftool.perl
diff options
context:
space:
mode:
authorTim Henigan <tim.henigan@gmail.com>2012-03-22 19:52:17 (GMT)
committerJunio C Hamano <gitster@pobox.com>2012-03-23 18:46:25 (GMT)
commit850896042a42c1c16912a3981ca844e2cbcd14d4 (patch)
treef38da913cd54a31969bff0381abbbc12642b8249 /git-difftool.perl
parent3f94ff755e266520ba2f6007d557395c33d30fdc (diff)
downloadgit-850896042a42c1c16912a3981ca844e2cbcd14d4.zip
git-850896042a42c1c16912a3981ca844e2cbcd14d4.tar.gz
git-850896042a42c1c16912a3981ca844e2cbcd14d4.tar.bz2
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>
Diffstat (limited to 'git-difftool.perl')
-rwxr-xr-xgit-difftool.perl7
1 files changed, 4 insertions, 3 deletions
diff --git a/git-difftool.perl b/git-difftool.perl
index bade735..93e84e8 100755
--- a/git-difftool.perl
+++ b/git-difftool.perl
@@ -22,7 +22,8 @@ sub usage
{
print << 'USAGE';
usage: git difftool [-t|--tool=<tool>]
- [-x|--extcmd=<cmd>] [-g|--gui]
+ [-x|--extcmd=<cmd>]
+ [-g|--gui] [--no-gui]
[--prompt] [-y|--no-prompt]
['git diff' options]
USAGE
@@ -49,7 +50,7 @@ sub exe
# parse command-line options. all unrecognized options and arguments
# are passed through to the 'git diff' command.
my ($difftool_cmd, $extcmd, $gui, $help, $prompt);
-GetOptions('g|gui' => \$gui,
+GetOptions('g|gui!' => \$gui,
'h' => \$help,
'prompt!' => \$prompt,
'y' => sub { $prompt = 0; },
@@ -75,7 +76,7 @@ if (defined($extcmd)) {
usage();
}
}
-if (defined($gui)) {
+if ($gui) {
my $guitool = "";
$guitool = Git::config('diff.guitool');
if (length($guitool) > 0) {