diff options
| author | Junio C Hamano <junkio@cox.net> | 2005-12-14 13:01:01 -0800 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2005-12-14 13:01:01 -0800 |
| commit | b0d3e9baaa16c805ef941e8f26d55fb23f091ef5 (patch) | |
| tree | 142e8fb76c906de7b61b9bf55ab026bee2388aa3 /git-am.sh | |
| parent | a4adf54d38ba49e58511aaafd18e99e6d3d4dabb (diff) | |
| parent | 5073eb04d6f0e8ac2578140b9231817e2afefe50 (diff) | |
| download | git-b0d3e9baaa16c805ef941e8f26d55fb23f091ef5.tar.xz | |
Merge branch 'fk/usage'
Diffstat (limited to 'git-am.sh')
| -rwxr-xr-x | git-am.sh | 10 |
1 files changed, 3 insertions, 7 deletions
@@ -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" |
