From: Stephan Beyer <s-beyer@gmx.net>
Date: Fri, 25 Jul 2008 18:22:23 +0000 (+0200)
Subject: git-am: Mention --abort in usage string part of OPTIONS_SPEC
X-Git-Tag: v1.6.0-rc1~35
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=09f8d055f9c2af79a72f8d2a2f13698d9bbe6956;p=git.git

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

diff --git a/git-am.sh b/git-am.sh
index f4abd9db1..6aa819280 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