summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael J Gruber <git@drmicha.warpmail.net>2011-02-14 16:48:08 (GMT)
committerJunio C Hamano <gitster@pobox.com>2011-02-15 18:53:24 (GMT)
commit24231e063f0f003f8ffd7b64c7ba6a0baaaa5283 (patch)
tree2b2ffbb4c1bb5a3793bee77d673b7abd85366b3d
parentcfb5e6b2da96c7803aa4a3813d27d2cbb47cda9e (diff)
downloadgit-24231e063f0f003f8ffd7b64c7ba6a0baaaa5283.zip
git-24231e063f0f003f8ffd7b64c7ba6a0baaaa5283.tar.gz
git-24231e063f0f003f8ffd7b64c7ba6a0baaaa5283.tar.bz2
pull: do not display fetch usage on --help-all
Currently, "git pull --help-all" displays the fetch usage info. Make it equivalent to "git pull -h" instead since "--help-all" is documented in gitcli(7). Do not try to sanitize the pull option parser (aka last hair puller). Signed-off-by: Michael J Gruber <git@drmicha.warpmail.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
-rwxr-xr-xgit-pull.sh2
1 files changed, 1 insertions, 1 deletions
diff --git a/git-pull.sh b/git-pull.sh
index eb87f49..f6b7b84 100755
--- a/git-pull.sh
+++ b/git-pull.sh
@@ -114,7 +114,7 @@ do
--d|--dr|--dry|--dry-|--dry-r|--dry-ru|--dry-run)
dry_run=--dry-run
;;
- -h|--h|--he|--hel|--help)
+ -h|--h|--he|--hel|--help|--help-|--help-a|--help-al|--help-all)
usage
;;
*)