diff --git a/git-am.sh b/git-am.sh index 6ed527c7a9..39f255209e 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=] [--utf8] [--binary] [--3way] " - echo >&2 " or, when resuming" - echo >&2 " $0 [--skip | --resolved]" - exit 1; -} +USAGE='[--signoff] [--dotest=] [--utf8] [--binary] [--3way] + or, when resuming [--skip | --resolved]' +. git-sh-setup stop_here () { echo "$1" >"$dotest/next"