aboutsummaryrefslogtreecommitdiff
path: root/git-am.sh
diff options
context:
space:
mode:
authorStephan Beyer <s-beyer@gmx.net>2008-07-12 17:47:16 +0200
committerJunio C Hamano <gitster@pobox.com>2008-07-13 16:08:27 -0700
commit356a32a23a2118e12a62fa42876a261feb554b1a (patch)
treef8eebdd147dbe4f8f8e1df7bcec46a841803f7e2 /git-am.sh
parent447d0cca45920bbe409361bb532444f810c75546 (diff)
downloadgit-356a32a23a2118e12a62fa42876a261feb554b1a.tar.gz
git-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>
Diffstat (limited to 'git-am.sh')
-rwxr-xr-xgit-am.sh2
1 files changed, 1 insertions, 1 deletions
diff --git a/git-am.sh b/git-am.sh
index 83b277acf..4e73f93a1 100755
--- a/git-am.sh
+++ b/git-am.sh
@@ -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
--