[PATCH] git-am: Mention --abort in usage string part of OPTIONS_SPEC

Stephan Beyer· Jul 25, 2008, 18:22 UTC · lore

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>
---

I could've sworn this had already been in fcab40a38 (git am --abort) but it wasn't. So here it is.

Regards.

 git-am.sh |    3 +--
 1 files changed, 1 insertions(+), 2 deletions(-)

Show changes to git-am.sh +1 −2

diff --git a/git-am.sh b/git-am.sh
index f4abd9d..6aa8192 100755
--- 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

-- 
1.6.0.rc0.106.g0f5bf

patchgit-am: Mention --abort in usage string part of OPTIONS_SPEC