summaryrefslogtreecommitdiff
path: root/Documentation/git-am.txt
diff options
context:
space:
mode:
authorStephan Beyer <s-beyer@gmx.net>2008-07-12 15:47:16 (GMT)
committerJunio C Hamano <gitster@pobox.com>2008-07-13 23:08:27 (GMT)
commit356a32a23a2118e12a62fa42876a261feb554b1a (patch)
treef8eebdd147dbe4f8f8e1df7bcec46a841803f7e2 /Documentation/git-am.txt
parent447d0cca45920bbe409361bb532444f810c75546 (diff)
downloadgit-356a32a23a2118e12a62fa42876a261feb554b1a.zip
git-356a32a23a2118e12a62fa42876a261feb554b1a.tar.gz
git-356a32a23a2118e12a62fa42876a261feb554b1a.tar.bz2
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>
Diffstat (limited to 'Documentation/git-am.txt')
-rw-r--r--Documentation/git-am.txt4
1 files changed, 2 insertions, 2 deletions
diff --git a/Documentation/git-am.txt b/Documentation/git-am.txt
index 3863eeb..eeb23b2 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
-----------