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>
Stephan Beyer committed
Jul 12, 2008 at 17:47 UTC
356a32a23a2118e12a62fa42876a261feb554b1a
3 files changed
+4
-4
Documentation/git-am.txt
+2
-2
@@ -12,8 +12,8 @@ SYNOPSIS
12
'git am' [--signoff] [--keep] [--utf8 | --no-utf8]
13
[--3way] [--interactive] [--binary]
14
[--whitespace=<option>] [-C<n>] [-p<n>]
15
- <mbox>|<Maildir>...
16
-'git am' [--skip | --resolved]
15
+ [<mbox> | <Maildir>...]
16
+'git am' (--skip | --resolved)
17
18
DESCRIPTION
19
-----------
builtin-mailsplit.c
+1
-1
@@ -9,7 +9,7 @@
9
#include "path-list.h"
10
11
static const char git_mailsplit_usage[] =
12
-"git-mailsplit [-d<prec>] [-f<n>] [-b] -o<directory> <mbox>|<Maildir>...";
12
+"git-mailsplit [-d<prec>] [-f<n>] [-b] -o<directory> [<mbox>|<Maildir>...]";
13
14
static int is_from_line(const char *line, int len)
15
{
git-am.sh
+1
-1
@@ -5,7 +5,7 @@
5
SUBDIRECTORY_OK=Yes
6
OPTIONS_KEEPDASHDASH=
7
OPTIONS_SPEC="\
8
-git-am [options] <mbox>|<Maildir>...
8
+git-am [options] [<mbox>|<Maildir>...]
9
git-am [options] --resolved
10
git-am [options] --skip
11
--