diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2011-10-12 12:34:30 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2011-10-12 12:34:30 -0700 |
| commit | 5366afaedecf78ba72b819b0dbb60bda3fce2ca0 (patch) | |
| tree | 3dddbad750b53fc0ac5546d00cb8009d3351897a /git-difftool.perl | |
| parent | Merge branch 'sp/smart-http-failure' (diff) | |
| parent | use -h for synopsis and --help for manpage consistently (diff) | |
| download | tgif-5366afaedecf78ba72b819b0dbb60bda3fce2ca0.tar.xz | |
Merge branch 'cb/do-not-pretend-to-hijack-long-help'
* cb/do-not-pretend-to-hijack-long-help:
use -h for synopsis and --help for manpage consistently
Diffstat (limited to 'git-difftool.perl')
| -rwxr-xr-x | git-difftool.perl | 2 |
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; |