X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=git-am.sh;fp=git-am.sh;h=39f255209e11283a0c3d402f215ff6c187922ea7;hb=cf1fe88ce1fb75db14549e9d57d88c2ad88caf9d;hp=6ed527c7a9c2d0bb9bbf84b2176b86ffc0670c93;hpb=4e7824b12e71127f1e3cf76fe2855887599c0dc6;p=git.git diff --git a/git-am.sh b/git-am.sh index 6ed527c7..39f25520 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"