diff options
| author | Stephan Beyer <s-beyer@gmx.net> | 2008-07-25 20:22:23 +0200 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2008-07-25 17:10:20 -0700 |
| commit | 09f8d055f9c2af79a72f8d2a2f13698d9bbe6956 (patch) | |
| tree | 868c83459a3d5a9ee68eb6b64412e51ca84187bf /git-am.sh | |
| parent | 837c8767130ec71089e654f92cf24e8277a3bda5 (diff) | |
| download | git-09f8d055f9c2af79a72f8d2a2f13698d9bbe6956.tar.gz git-09f8d055f9c2af79a72f8d2a2f13698d9bbe6956.tar.xz | |
git-am: Mention --abort in usage string part of OPTIONS_SPEC
The three separate lines for --skip, --resolved and --abort
are merged into one so that it is easy to see that they're
alternative and related options.
Signed-off-by: Stephan Beyer <s-beyer@gmx.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'git-am.sh')
| -rwxr-xr-x | git-am.sh | 3 |
1 files changed, 1 insertions, 2 deletions
@@ -6,8 +6,7 @@ SUBDIRECTORY_OK=Yes OPTIONS_KEEPDASHDASH= OPTIONS_SPEC="\ git am [options] [<mbox>|<Maildir>...] -git am [options] --resolved -git am [options] --skip +git am [options] (--resolved | --skip | --abort) -- d,dotest= (removed -- do not use) i,interactive run interactively |