git-am/git-mailsplit: correct synopsis for reading from stdin

Invoking git-am or git-mailsplit without mbox or Maildir results in
reading an mbox from stdin.  Mention this in the synopsis and usage
strings.

Signed-off-by: Stephan Beyer <s-beyer@gmx.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/Documentation/git-am.txt b/Documentation/git-am.txt
index 3863eebcef8533de78adf8733b580f146ac66ec4..eeb23b25b0d70c4ccc3eb9d091971b1f20ad4b4b 100644 (file)
--- a/Documentation/git-am.txt
+++ b/Documentation/git-am.txt
@@ -12,8 +12,8 @@ SYNOPSIS
 'git am' [--signoff] [--keep] [--utf8 | --no-utf8]
          [--3way] [--interactive] [--binary]
          [--whitespace=<option>] [-C<n>] [-p<n>]
 'git am' [--signoff] [--keep] [--utf8 | --no-utf8]
          [--3way] [--interactive] [--binary]
          [--whitespace=<option>] [-C<n>] [-p<n>]

-         <mbox>|<Maildir>...
-'git am' [--skip | --resolved]
+        [<mbox> | <Maildir>...]
+'git am' (--skip | --resolved)

 
 DESCRIPTION
 -----------
 
 DESCRIPTION
 -----------

diff --git a/builtin-mailsplit.c b/builtin-mailsplit.c
index ae2b4cb21bf4e691a044e2ace3cdd4861562ceca..e8cbe678ecdc0863ebe92e6499dd2b1eacf77db6 100644 (file)
--- a/builtin-mailsplit.c
+++ b/builtin-mailsplit.c
@@ -9,7 +9,7 @@
 #include "path-list.h"
 
 static const char git_mailsplit_usage[] =
 #include "path-list.h"
 
 static const char git_mailsplit_usage[] =

-"git-mailsplit [-d<prec>] [-f<n>] [-b] -o<directory> <mbox>|<Maildir>...";
+"git-mailsplit [-d<prec>] [-f<n>] [-b] -o<directory> [<mbox>|<Maildir>...]";

 
 static int is_from_line(const char *line, int len)
 {
 
 static int is_from_line(const char *line, int len)
 {

diff --git a/git-am.sh b/git-am.sh
index 83b277acfdeafa1f745c3c96bc10eef320a2d6ec..4e73f93a1f1906db8212a1aa9236bdfa03ae1a00 100755 (executable)
--- a/git-am.sh
+++ b/git-am.sh
@@ -5,7 +5,7 @@
 SUBDIRECTORY_OK=Yes
 OPTIONS_KEEPDASHDASH=
 OPTIONS_SPEC="\
 SUBDIRECTORY_OK=Yes
 OPTIONS_KEEPDASHDASH=
 OPTIONS_SPEC="\

-git-am [options] <mbox>|<Maildir>...
+git-am [options] [<mbox>|<Maildir>...]

 git-am [options] --resolved
 git-am [options] --skip
 --
 git-am [options] --resolved
 git-am [options] --skip
 --