diff options
| author | Fernando J. Pereda <ferdy@gentoo.org> | 2007-05-25 02:15:36 +0400 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2007-05-25 06:01:56 +0400 |
| commit | d63bd9a217c0f9284e4195495dc0d078f5e6577e (patch) | |
| tree | 9c7fc64521b53e68446edeba9462778b0523d2ef /Documentation/git-am.txt | |
| parent | 98ee8187e4e331716be0797169ba9ddbb26efe56 (diff) | |
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.txt | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/Documentation/git-am.txt b/Documentation/git-am.txt index ba79773f79..25cf84a0c7 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 |