summaryrefslogtreecommitdiff
path: root/git-difftool.perl
diff options
context:
space:
mode:
authorClemens Buchacher <drizzd@aon.at>2011-10-03 20:21:36 +0200
committerJunio C Hamano <gitster@pobox.com>2011-10-05 10:47:10 -0700
commit87182b17ed471a7b9cbbc24e1c02f90c8725dc6f (patch)
treee2f6010409a4ae975cf36439cfb384b08b75e5fc /git-difftool.perl
parent703f05ad5835cff92b12c29aecf8d724c8c847e2 (diff)
downloadgit-87182b17ed471a7b9cbbc24e1c02f90c8725dc6f.tar.gz
use -h for synopsis and --help for manpage consistentlycb/do-not-pretend-to-hijack-long-help
A few scripted Porcelain implementations pretend as if the routine to show their own help messages are triggered upon "git cmd --help", but a command line parser of "git" will hijack such a request and shows the manpage for the cmd subcommand. Leaving the code to handle such input is simply misleading. Signed-off-by: Clemens Buchacher <drizzd@aon.at> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'git-difftool.perl')
-rwxr-xr-xgit-difftool.perl2
1 files changed, 1 insertions, 1 deletions
diff --git a/git-difftool.perl b/git-difftool.perl
index ced1615e21..09b65f1770 100755
--- a/git-difftool.perl
+++ b/git-difftool.perl
@@ -97,7 +97,7 @@ sub generate_command
$prompt = 'yes';
next;
}
- if ($arg eq '-h' || $arg eq '--help') {
+ if ($arg eq '-h') {
usage();
}
push @command, $arg;