From: Michael J Gruber <git@drmicha.warpmail.net>
Date: Mon, 14 Feb 2011 16:48:08 +0000 (+0100)
Subject: pull: do not display fetch usage on --help-all
X-Git-Tag: v1.7.4.2~54
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=24231e063f0f003f8ffd7b64c7ba6a0baaaa5283;p=git.git

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>
---

diff --git a/git-pull.sh b/git-pull.sh
index eb87f4906..f6b7b8404 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
 		;;
 	*)