Andrew's git / gitweb.git / diff
?
git-am: Mention --abort in usage string part of OPTIONS_SPEC
authorStephan Beyer <s-beyer@gmx.net>
Fri, 25 Jul 2008 18:22:23 +0000 (20:22 +0200)
committerJunio C Hamano <gitster@pobox.com>
Sat, 26 Jul 2008 00:10:20 +0000 (17:10 -0700)
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>
git-am.sh patch | blob | history
diff --git a/git-am.sh b/git-am.sh
index f4abd9db15d7e7213e0d94a6c36e5205b7c5e0ce..6aa819280ef99ccbbdeefde037e99fae3e6f0110 100755 (executable)
--- a/git-am.sh
+++ b/git-am.sh
@@ -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