[PATCH 0/11] Usage string clean-up · <hidden> · 2016-06-15
[PATCH 8/11] git-lost-found: Usage string clean-up, emit usage string at incorrect invocation · <hidden> · 2016-06-15
[PATCH 4/11] git-am: Usage string clean-up · <hidden> · 2016-06-15
[PATCH 3/11] git-revert: Usage string clean-up · <hidden> · 2016-06-15
[PATCH 2/11] git-verify-tag: Usage string clean-up, emit usage string at incorrect invocation · <hidden> · 2016-06-15
[PATCH 1/11] Trivial usage string clean-up · <hidden> · 2016-06-15
[PATCH 9/11] git-prune: Usage string clean-up, use the 'usage' function · <hidden> · 2016-06-15
[PATCH 11/11] git-repack: Usage string clean-up, emit usage at incorrect invocation · <hidden> · 2016-06-15
[PATCH 10/11] git-rebase: Usage string clean-up, emit usage string at incorrect invocation · <hidden> · 2016-06-15
[PATCH 5/11] git-applypatch: Usage string clean-up, emit usage string at incorrect invocation · <hidden> · 2016-06-15
Re: [PATCH 5/11] git-applypatch: Usage string clean-up, emit usage string at incorrect invocation · Junio C Hamano <hidden> · 2016-06-15
Re: [PATCH 5/11] git-applypatch: Usage string clean-up, emit usage string at incorrect invocation · Timo Hirvonen <hidden> · 2016-06-15
Re: [PATCH 5/11] git-applypatch: Usage string clean-up, emit usage string at incorrect invocation · Fredrik Kuivinen <hidden> · 2016-06-15
Re: [PATCH 5/11] git-applypatch: Usage string clean-up, emit usage string at incorrect invocation · Marco Costalba <hidden> · 2016-06-15
[PATCH 7/11] git-fetch: Usage string clean-up, emit usage string at unrecognized option · <hidden> · 2016-06-15
[PATCH 6/11] git-cherry: Usage string clean-up, use the 'usage' function · <hidden> · 2016-06-15

STALE3753d

[PATCH 4/11] git-am: Usage string clean-up

From: <hidden>
Date: 2016-06-15 22:42:14
Subsystem: the rest · Maintainer: Linus Torvalds

Signed-off-by: Fredrik Kuivinen <redacted>

---

 git-am.sh |   10 +++-------
 1 files changed, 3 insertions(+), 7 deletions(-)

243b906a6786cd7401285cacaf9ade994ff83db8

diff --git a/git-am.sh b/git-am.sh
index 6ed527c..39f2552 100755
--- a/git-am.sh
+++ b/git-am.sh

@@ -1,14 +1,10 @@
 #!/bin/sh
 #
 #
-. git-sh-setup
 
-usage () {
-    echo >&2 "usage: $0 [--signoff] [--dotest=<dir>] [--utf8] [--binary] [--3way] <mbox>"
-    echo >&2 "	or, when resuming"
-    echo >&2 "	$0 [--skip | --resolved]"
-    exit 1;
-}
+USAGE='[--signoff] [--dotest=<dir>] [--utf8] [--binary] [--3way] <mbox>
+  or, when resuming [--skip | --resolved]'
+. git-sh-setup
 
 stop_here () {
     echo "$1" >"$dotest/next"

-- 
0.99.9.GIT