summaryrefslogtreecommitdiff
path: root/Documentation/git-am.txt
diff options
context:
space:
mode:
authorFernando J. Pereda <ferdy@gentoo.org>2007-05-24 22:15:36 (GMT)
committerJunio C Hamano <junkio@cox.net>2007-05-25 02:01:56 (GMT)
commitd63bd9a217c0f9284e4195495dc0d078f5e6577e (patch)
tree9c7fc64521b53e68446edeba9462778b0523d2ef /Documentation/git-am.txt
parent98ee8187e4e331716be0797169ba9ddbb26efe56 (diff)
downloadgit-d63bd9a217c0f9284e4195495dc0d078f5e6577e.zip
git-d63bd9a217c0f9284e4195495dc0d078f5e6577e.tar.gz
git-d63bd9a217c0f9284e4195495dc0d078f5e6577e.tar.bz2
Teach mailsplit about Maildir's
Signed-off-by: Fernando J. Pereda <ferdy@gentoo.org> Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 'Documentation/git-am.txt')
-rw-r--r--Documentation/git-am.txt8
1 files changed, 5 insertions, 3 deletions
diff --git a/Documentation/git-am.txt b/Documentation/git-am.txt
index ba79773..25cf84a 100644
--- a/Documentation/git-am.txt
+++ b/Documentation/git-am.txt
@@ -12,7 +12,8 @@ SYNOPSIS
'git-am' [--signoff] [--dotest=<dir>] [--keep] [--utf8 | --no-utf8]
[--3way] [--interactive] [--binary]
[--whitespace=<option>] [-C<n>] [-p<n>]
- <mbox>...
+ <mbox>|<Maildir>...
+
'git-am' [--skip | --resolved]
DESCRIPTION
@@ -23,9 +24,10 @@ current branch.
OPTIONS
-------
-<mbox>...::
+<mbox>|<Maildir>...::
The list of mailbox files to read patches from. If you do not
- supply this argument, reads from the standard input.
+ supply this argument, reads from the standard input. If you supply
+ directories, they'll be treated as Maildirs.
-s, --signoff::
Add `Signed-off-by:` line to the commit message, using