* [PATCH] git-am: Mention --abort in usage string part of OPTIONS_SPEC
@ 2008-07-25 18:22 Stephan Beyer
0 siblings, 0 replies; only message in thread
From: Stephan Beyer @ 2008-07-25 18:22 UTC (permalink / raw)
To: git; +Cc: Junio C Hamano, Stephan Beyer
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(-)
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
^ permalink raw reply related [flat|nested] only message in thread
only message in thread, other threads:[~2008-07-25 18:23 UTC | newest]
Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2008-07-25 18:22 [PATCH] git-am: Mention --abort in usage string part of OPTIONS_SPEC Stephan Beyer
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).