diff options
| author |  Stephan Beyer <s-beyer@gmx.net> | 2008-07-12 17:47:16 +0200 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2008-07-13 16:08:27 -0700 |
| commit | 356a32a23a2118e12a62fa42876a261feb554b1a (patch) | |
| tree | f8eebdd147dbe4f8f8e1df7bcec46a841803f7e2 | |
| parent | Merge branch 'maint' to sync with 1.5.6.3 (diff) | |
| download | tgif-356a32a23a2118e12a62fa42876a261feb554b1a.tar.xz | |
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>
| -rw-r--r-- | Documentation/git-am.txt | 4 | ||||
| -rw-r--r-- | builtin-mailsplit.c | 2 | ||||
| -rwxr-xr-x | git-am.sh | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/Documentation/git-am.txt b/Documentation/git-am.txt index 3863eebcef..eeb23b25b0 100644 --- 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>] - <mbox>|<Maildir>... -'git am' [--skip | --resolved] + [<mbox> | <Maildir>...] +'git am' (--skip | --resolved) DESCRIPTION ----------- diff --git a/builtin-mailsplit.c b/builtin-mailsplit.c index ae2b4cb21b..e8cbe678ec 100644 --- a/builtin-mailsplit.c +++ b/builtin-mailsplit.c @@ -9,7 +9,7 @@ #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) { @@ -5,7 +5,7 @@ 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 -- |