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>
Stephan Beyer committed
Jul 25, 2008 at 20:22 UTC
09f8d055f9c2af79a72f8d2a2f13698d9bbe6956
1 file changed
+1
-2
git-am.sh
+1
-2
@@ -6,8 +6,7 @@ SUBDIRECTORY_OK=Yes
6
OPTIONS_KEEPDASHDASH=
7
OPTIONS_SPEC="\
8
git am [options] [<mbox>|<Maildir>...]
9
-git am [options] --resolved
10
-git am [options] --skip
9
+git am [options] (--resolved | --skip | --abort)
10
--
11
d,dotest= (removed -- do not use)
12
i,interactive run interactively