aboutsummaryrefslogtreecommitdiffstats
path: root/git-pull.sh
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2011-10-12 12:34:30 -0700
committerJunio C Hamano <gitster@pobox.com>2011-10-12 12:34:30 -0700
commit5366afaedecf78ba72b819b0dbb60bda3fce2ca0 (patch)
tree3dddbad750b53fc0ac5546d00cb8009d3351897a /git-pull.sh
parentMerge branch 'sp/smart-http-failure' (diff)
parentuse -h for synopsis and --help for manpage consistently (diff)
downloadgit-5366afaedecf78ba72b819b0dbb60bda3fce2ca0.tar.gz
git-5366afaedecf78ba72b819b0dbb60bda3fce2ca0.zip
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-pull.sh')
-rwxr-xr-xgit-pull.sh2
1 files changed, 1 insertions, 1 deletions
diff --git a/git-pull.sh b/git-pull.sh
index 63da37bcc2..8c1370f81b 100755
--- a/git-pull.sh
+++ b/git-pull.sh
@@ -120,7 +120,7 @@ do
--d|--dr|--dry|--dry-|--dry-r|--dry-ru|--dry-run)
dry_run=--dry-run
;;
- -h|--h|--he|--hel|--help|--help-|--help-a|--help-al|--help-all)
+ -h|--help-all)
usage
;;
*)