patch, 25 partsgit-cherry: Print the usage message if we get an unknown option.

diff --git a/git-bisect.sh b/git-bisect.sh
index 05dae8a..6ec35ab 100755
--- a/git-bisect.sh
+++ b/git-bisect.sh
@@ -12,7 +12,7 @@ sq() {
 }
 
 usage() {
-    echo >&2 'usage: git bisect [start|bad|good|next|reset|visualize]
+    echo >&2 'usage: $0 [start|bad|good|next|reset|visualize]
 git bisect start [<pathspec>]	reset bisect state and start bisection.
 git bisect bad [<rev>]		mark <rev> a known-bad revision.
 git bisect good [<rev>...]	mark <rev>... known-good revisions.

diff --git a/git-cherry.sh b/git-cherry.sh
index 867522b..c21cf65 100755
--- a/git-cherry.sh
+++ b/git-cherry.sh
@@ -5,7 +5,8 @@
 
 . git-sh-setup
 
-usage="usage: $0 "'[-v] <upstream> [<head>]
+usage () {
+    die "usage: $0 "'[-v] <upstream> [<head>]
 
              __*__*__*__*__> <upstream>
             /
@@ -18,8 +19,19 @@ compared against the change each commit 
 it is shown on the standard output with prefix "+".  Otherwise
 it is shown with prefix "-".
 '
+}
 
-case "$1" in -v) verbose=t; shift ;; esac 
+while [ "$#" != "0" ]; do
+    case "$1" in
+        "-v")
+            verbose=t;
+            shift
+            ;;
+        -*)
+            usage
+            ;;
+    esac
+done
 
 case "$#,$1" in
 1,*..*)
@@ -35,7 +47,7 @@ case "$#" in
 2) upstream=`git-rev-parse --verify "$1"` &&
    ours=`git-rev-parse --verify "$2"` || exit
    ;;
-*) echo >&2 "$usage"; exit 1 ;;
+*) usage ;;
 esac
 
 # Note that these list commits in reverse order;

diff --git a/git-branch.sh b/git-branch.sh
index 5306b27..90a1b5b 100755
--- a/git-branch.sh
+++ b/git-branch.sh
@@ -8,7 +8,7 @@ die () {
 }
 
 usage () {
-    echo >&2 "usage: $(basename $0)"' [-d <branch>] | [[-f] <branch> [start-point]]
+    echo >&2 "usage: $0"' [-d <branch>] | [[-f] <branch> [start-point]]
 
 If no arguments, show available branches and mark current branch with a star.
 If one argument, create a new branch <branchname> based off of current HEAD.

diff --git a/git-checkout.sh b/git-checkout.sh
index 4cf30e2..2fcd766 100755
--- a/git-checkout.sh
+++ b/git-checkout.sh
@@ -2,7 +2,7 @@
 . git-sh-setup
 
 usage () {
-    die "usage: git checkout [-f] [-b <new_branch>] [<branch>] [<paths>...]"
+    die "usage: $0 [-f] [-b <new_branch>] [<branch>] [<paths>...]"
 }
 
 old=$(git-rev-parse HEAD)

diff --git a/git-format-patch.sh b/git-format-patch.sh
index 1eebe85..4ecbf49 100755
--- a/git-format-patch.sh
+++ b/git-format-patch.sh
@@ -10,7 +10,7 @@ LANG=C LC_ALL=C
 export LANG LC_ALL
 
 usage () {
-    echo >&2 "usage: $0"' [-n] [-o dir | --stdout] [--keep-subject] [--mbox]
+    die "usage: $0"' [-n] [-o dir | --stdout] [--keep-subject] [--mbox]
     [--check] [--signoff] [-<diff options>...]
     [--help]
     ( from..to ... | upstream [ our-head ] )
@@ -30,7 +30,6 @@ When --mbox is specified, the output is 
 UNIX mailbox format, and can be concatenated together for processing
 with applymbox.
 '
-    exit 1
 }
 
 diff_opts=

diff --git a/git-commit.sh b/git-commit.sh
index 3d250ec..1893f98 100755
--- a/git-commit.sh
+++ b/git-commit.sh
@@ -6,7 +6,7 @@
 . git-sh-setup
 
 usage () {
-	die 'git commit [-a] [-s] [-v | --no-verify]  [-m <message> | -F <logfile> | (-C|-c) <commit>] [-e] [<path>...]'
+	die "usage: $0 [-a] [-s] [-v | --no-verify]  [-m <message> | -F <logfile> | (-C|-c) <commit>] [-e] [<path>...]"
 }
 
 all= logfile= use_commit= no_edit= log_given= log_message= verify=t signoff=

diff --git a/git-clone.sh b/git-clone.sh
index 699205e..d07e4d9 100755
--- a/git-clone.sh
+++ b/git-clone.sh
@@ -9,7 +9,7 @@
 unset CDPATH
 
 usage() {
-	echo >&2 "* git clone [-l [-s]] [-q] [-u <upload-pack>] [-n] <repo> [<dir>]"
+	echo >&2 "usage: $0 [-l [-s]] [-q] [-u <upload-pack>] [-n] <repo> [<dir>]"
 	exit 1
 }
 

diff --git a/git-count-objects.sh b/git-count-objects.sh
index 40c58ef..0d544ad 100755
--- a/git-count-objects.sh
+++ b/git-count-objects.sh
@@ -3,7 +3,16 @@
 # Copyright (c) 2005 Junio C Hamano
 #
 
-GIT_DIR=`git-rev-parse --git-dir` || exit $?
+. git-sh-setup
+
+usage () {
+    die "usage: $0"
+}
+
+if [ "$#" != "0" ]
+then
+    usage
+fi
 
 dc </dev/null 2>/dev/null || {
 	# This is not a real DC at all -- it just knows how

diff --git a/git-fetch.sh b/git-fetch.sh
index 14ea295..18b421d 100755
--- a/git-fetch.sh
+++ b/git-fetch.sh
@@ -2,6 +2,11 @@
 #
 . git-sh-setup
 . git-parse-remote
+
+usage () {
+    die "usage: $0 <fetch-options> <repository> <refspec>..."
+}
+
 _x40='[0-9a-f][0-9a-f][0-9a-f][0-9a-f][0-9a-f]'
 _x40="$_x40$_x40$_x40$_x40$_x40$_x40$_x40$_x40"
 
@@ -34,6 +39,9 @@ do
 	-v|--verbose)
 		verbose=Yes
 		;;
+        -*)
+                usage
+                ;;
 	*)
 		break
 		;;

diff --git a/git-grep.sh b/git-grep.sh
index 44c1613..e6acc41 100755
--- a/git-grep.sh
+++ b/git-grep.sh
@@ -3,6 +3,11 @@
 # Copyright (c) Linus Torvalds, 2005
 #
 
+usage () {
+        echo >&2 "usage: $0 <option>... <pattern> [pathspec*]"
+        exit 1
+}
+
 pattern=
 flags=()
 git_flags=()
@@ -26,6 +31,9 @@ while : ; do
 		shift
 		break
 		;;
+        -h|--h|--he|--hel|--help)
+                usage
+                ;;
 	-*)
 		flags=("${flags[@]}" "$1")
 		;;
@@ -40,8 +48,7 @@ while : ; do
 	shift
 done
 [ "$pattern" ] || {
-	echo >&2 "usage: 'git grep <pattern> [pathspec*]'"
-	exit 1
+        usage
 }
 git-ls-files -z "${git_flags[@]}" "$@" |
 	xargs -0 grep "${flags[@]}" -e "$pattern"

diff --git a/git-push.sh b/git-push.sh
index 140c8f8..3336312 100755
--- a/git-push.sh
+++ b/git-push.sh
@@ -2,7 +2,7 @@
 . git-sh-setup
 
 usage () {
-    die "Usage: git push [--all] [--force] <repository> [<refspec>]"
+    die "usage: git push [--all] [--force] <repository> [<refspec>...]"
 }
 
 

diff --git a/git-pull.sh b/git-pull.sh
index 3a13984..5a1ae2c 100755
--- a/git-pull.sh
+++ b/git-pull.sh
@@ -12,8 +12,7 @@ usage () {
     [<fetch-options>]
     <repo> <head>...
 
-Fetch one or more remote refs and merge it/them into the current HEAD.
-'
+Fetch one or more remote refs and merge it/them into the current HEAD.'
     exit 1
 }
 

diff --git a/git-merge.sh b/git-merge.sh
index a221daa..f7aca19 100755
--- a/git-merge.sh
+++ b/git-merge.sh
@@ -9,7 +9,7 @@ LF='
 '
 
 usage () {
-    die "git-merge [-n] [--no-commit] [-s <strategy>]... <merge-message> <head> <remote>+"
+    die "usage: $0 [-n] [--no-commit] [-s <strategy>]... <merge-message> <head> <remote>+"
 }
 
 all_strategies='recursive octopus resolve stupid ours'

diff --git a/git-push.sh b/git-push.sh
index 140c8f8..3336312 100755
--- a/git-push.sh
+++ b/git-push.sh
@@ -2,7 +2,7 @@
 . git-sh-setup
 
 usage () {
-    die "Usage: git push [--all] [--force] <repository> [<refspec>]"
+    die "usage: $0 [--all] [--force] <repository> [<refspec>...]"
 }
 
 

diff --git a/git-prune.sh b/git-prune.sh
index 7e7f0ad..289aca0 100755
--- a/git-prune.sh
+++ b/git-prune.sh
@@ -9,7 +9,7 @@ do
     case "$1" in
     -n) dryrun=-n echo=echo ;;
     --) break ;;
-    -*) echo >&2 "usage: git-prune [ -n ] [ heads... ]"; exit 1 ;;
+    -*) echo >&2 "usage: $0 [-n] [--] [<head>...]"; exit 1 ;;
     *)  break ;;
     esac
     shift;

Documentation/git-revert.txt, git-revert.sh

diff --git a/Documentation/git-revert.txt b/Documentation/git-revert.txt
index e27c680..6684a60 100644
--- a/Documentation/git-revert.txt
+++ b/Documentation/git-revert.txt
@@ -7,7 +7,7 @@ git-revert - Revert an existing commit.
 
 SYNOPSIS
 --------
-'git-revert' [--edit | --no-edit] [-n] <commit>
+'git-revert' [--edit | --no-edit] [-n | --no-commit] <commit>
 
 DESCRIPTION
 -----------
diff --git a/git-revert.sh b/git-revert.sh
index 9d499c4..0a94344 100755
--- a/git-revert.sh
+++ b/git-revert.sh
@@ -19,10 +19,10 @@ esac
 usage () {
 	case "$me" in
 	cherry-pick)
-		die "usage git $me [--edit] [-n] [-r] <commit-ish>"
+		die "usage: $0 [--edit] [-n | --no-commit] [-r] <commit>"
 		;;
 	revert)
-		die "usage git $me [--edit | --no-edit] [-n] <commit-ish>"
+		die "usage $0 [--edit | --no-edit] [-n | --no-commit] <commit>"
 		;;
 	esac
 }

diff --git a/git-lost-found.sh b/git-lost-found.sh
index 2beec2a..757e51f 100755
--- a/git-lost-found.sh
+++ b/git-lost-found.sh
@@ -1,6 +1,16 @@
 #!/bin/sh
 
-GIT_DIR=`git-rev-parse --git-dir` || exit $?
+. git-sh-setup
+
+usage () {
+	die "usage: $0"
+}
+
+if [ "$#" != "0" ]
+then
+    usage
+fi
+
 laf="$GIT_DIR/lost-found"
 rm -fr "$laf" && mkdir -p "$laf/commit" "$laf/other" || exit
 

diff --git a/git-request-pull.sh b/git-request-pull.sh
index ae6cd27..e199a91 100755
--- a/git-request-pull.sh
+++ b/git-request-pull.sh
@@ -6,9 +6,9 @@
 
 usage()
 {
-	echo "$0 <commit> <url> [ <head> ]"
-	echo "  Summarizes the changes since <commit> to the standard output,"
-	echo "  and includes <url> in the message generated."
+	echo >&2 "usage: $0 <commit> <url> [<head>]"
+	echo >&2 '  Summarizes the changes since <commit> to the standard output,'
+	echo >&2 '  and includes <url> in the message generated.'
 	exit 1
 }
 

diff --git a/git-reset.sh b/git-reset.sh
index 72ef303..58600fc 100755
--- a/git-reset.sh
+++ b/git-reset.sh
@@ -2,7 +2,7 @@
 . git-sh-setup
 
 usage () {
-	die 'Usage: git reset [--mixed | --soft | --hard]  [<commit-ish>]'
+	die 'usage: $0 [--mixed | --soft | --hard]  [<commit-ish>]'
 }
 
 tmp=/var/tmp/reset.$$

diff --git a/git-relink.perl b/git-relink.perl
index f6b4f6a..816e238 100755
--- a/git-relink.perl
+++ b/git-relink.perl
@@ -163,11 +163,11 @@ sub link_two_files($$) {
 
 
 sub usage() {
-	print("Usage: $0 [--safe] <dir> [<dir> ...] <master_dir> \n");
-	print("All directories should contain a .git/objects/ subdirectory.\n");
-	print("Options\n");
-	print("\t--safe\t" .
+	print STDERR "usage: $0 [--safe] <dir> [<dir>...] <master_dir>\n";
+	print STDERR "All directories should contain a .git/objects/ subdirectory.\n";
+	print STDERR "Options\n";
+	print STDERR "\t--safe\t" .
 		"Stops if two objects with the same hash exist but " .
-		"have different sizes.  Default is to warn and continue.\n");
+		"have different sizes.  Default is to warn and continue.\n";
 	exit(1);
 }

diff --git a/git-repack.sh b/git-repack.sh
index 430ddc5..9752032 100755
--- a/git-repack.sh
+++ b/git-repack.sh
@@ -4,7 +4,11 @@
 #
 
 . git-sh-setup
-	
+
+usage () {
+	die "usage: $0 [-a] [-d] [-l] [-n]"
+}
+
 no_update_info= all_into_one= remove_redundant= local=
 while case "$#" in 0) break ;; esac
 do
@@ -13,6 +17,7 @@ do
 	-a)	all_into_one=t ;;
 	-d)	remove_redundant=t ;;
 	-l)	local=t ;;
+	-*)	usage ;;
 	*)	break ;;
 	esac
 	shift

diff --git a/git-send-email.perl b/git-send-email.perl
index ec1428d..5f6b729 100755
--- a/git-send-email.perl
+++ b/git-send-email.perl
@@ -27,6 +27,38 @@ use Email::Valid;
 sub unique_email_list(@);
 sub cleanup_compose_files();
 
+sub usage {
+	print <<EOT;
+$0 [options] <file | directory> [... file | directory ]
+Options:
+   --from         Specify the "From:" line of the email to be sent.
+
+   --to           Specify the primary "To:" line of the email.
+
+   --compose      Use \$EDITOR to edit an introductory message for the
+                  patch series.
+
+   --subject      Specify the initial "Subject:" line.
+                  Only necessary if --compose is also set.  If --compose
+		  is not set, this will be prompted for.
+
+   --in-reply-to  Specify the first "In-Reply-To:" header line.
+                  Only used if --compose is also set.  If --compose is not
+		  set, this will be prompted for.
+
+   --chain-reply-to If set, the replies will all be to the previous
+                  email sent, rather than to the first email sent.
+                  Defaults to on.
+
+   --smtp-server  If set, specifies the outgoing SMTP server to use.
+                  Defaults to localhost.
+EOT
+
+	print $_[0], "\n" if defined $_[0];
+
+	exit(1);
+}
+
 # Constants (essentially)
 my $compose_filename = ".msg.$$";
 
@@ -51,6 +83,7 @@ my $rc = GetOptions("from=s" => \$from,
 		    "chain-reply-to!" => \$chain_reply_to,
 		    "smtp-server=s" => \$smtp_server,
 		    "compose" => \$compose,
+		    "help|h" => sub { usage; },
 	 );
 
 # Now, let's fill any that aren't set in with defaults:
@@ -187,34 +220,7 @@ for my $f (@ARGV) {
 if (@files) {
 	print $_,"\n" for @files;
 } else {
-	print <<EOT;
-git-send-email [options] <file | directory> [... file | directory ]
-Options:
-   --from         Specify the "From:" line of the email to be sent.
-
-   --to           Specify the primary "To:" line of the email.
-
-   --compose      Use \$EDITOR to edit an introductory message for the
-                  patch series.
-
-   --subject      Specify the initial "Subject:" line.
-                  Only necessary if --compose is also set.  If --compose
-		  is not set, this will be prompted for.
-
-   --in-reply-to  Specify the first "In-Reply-To:" header line.
-                  Only used if --compose is also set.  If --compose is not
-		  set, this will be prompted for.
-
-   --chain-reply-to If set, the replies will all be to the previous
-                  email sent, rather than to the first email sent.
-                  Defaults to on.
-
-   --smtp-server  If set, specifies the outgoing SMTP server to use.
-                  Defaults to localhost.
-
-Error: Please specify a file or a directory on the command line.
-EOT
-	exit(1);
+	usage "Error: Please specify a file or a directory on the command line.";
 }
 
 # Variables we set as part of the loop over files

diff --git a/git-tag.sh b/git-tag.sh
index 2435a75..f4a0150 100755
--- a/git-tag.sh
+++ b/git-tag.sh
@@ -1,16 +1,10 @@
 #!/bin/sh
 # Copyright (c) 2005 Linus Torvalds
 
-GIT_DIR=`git-rev-parse --git-dir` || exit $?
+. git-sh-setup
 
 usage () {
-    echo >&2 "Usage: git-tag [-a | -s | -u <key-id>] [-f | -d] [-m <msg>] <tagname> [<head>]"
-    exit 1
-}
-
-die () {
-    echo >&2 "$*"
-    exit 1
+    die "usage: $0 [-a | -s | -u <key-id>] [-f | -d] [-m <msg>] <tagname> [<head>]"
 }
 
 annotate=

diff --git a/git-status.sh b/git-status.sh
index 2dda0c5..4ba6cc2 100755
--- a/git-status.sh
+++ b/git-status.sh
@@ -2,7 +2,17 @@
 #
 # Copyright (c) 2005 Linus Torvalds
 #
-GIT_DIR=$(git-rev-parse --git-dir) || exit
+
+. git-sh-setup
+
+usage () {
+	die "usage: $0"
+}
+
+if [ "$#" != "0" ]
+then
+    usage
+fi
 
 report () {
   header="#

diff --git a/git-mv.perl b/git-mv.perl
index 83dc7e4..db6699d 100755
--- a/git-mv.perl
+++ b/git-mv.perl
@@ -12,13 +12,21 @@ use strict;
 use Getopt::Std;
 
 sub usage() {
-	print <<EOT;
+	print STDERR <<EOT;
 $0 [-f] [-n] <source> <destination>
 $0 [-f] [-n] [-k] <source> ... <destination directory>
 EOT
 	exit(1);
 }
 
+sub HELP_MESSAGE() {
+	usage;
+}
+
+sub VERSION_MESSAGE() {
+	usage;
+}
+
 my $GIT_DIR = `git rev-parse --git-dir`;
 exit 1 if $?; # rev-parse would have given "not a git dir" message.
 chomp($GIT_DIR);

diff --git a/git-verify-tag.sh b/git-verify-tag.sh
index 1f44da5..aff7c68 100755
--- a/git-verify-tag.sh
+++ b/git-verify-tag.sh
@@ -1,14 +1,14 @@
 #!/bin/sh
 
-GIT_DIR=`git-rev-parse --git-dir` || exit $?
+. git-sh-setup
 
-die () {
-    echo >&2 "$*"
-    exit 1
+usage () {
+    echo >&2 "usage: $0 [-a | -s | -u <key-id>] [-f | -d] [-m <msg>] <tagname> [<head>]"
+    die "$@"
 }
 
 type="$(git-cat-file -t "$1" 2>/dev/null)" ||
-	die "$1: no such object."
+	usage "$1: no such object."
 
 test "$type" = tag ||
 	die "$1: cannot verify a non-tag object of type $type."