diff options
| author | Fernando J. Pereda <ferdy@gentoo.org> | 2007-05-25 00:15:36 +0200 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2007-05-24 19:01:56 -0700 |
| commit | d63bd9a217c0f9284e4195495dc0d078f5e6577e (patch) | |
| tree | 9c7fc64521b53e68446edeba9462778b0523d2ef /Documentation | |
| parent | 98ee8187e4e331716be0797169ba9ddbb26efe56 (diff) | |
| download | git-d63bd9a217c0f9284e4195495dc0d078f5e6577e.tar.gz git-d63bd9a217c0f9284e4195495dc0d078f5e6577e.tar.xz | |
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')
| -rw-r--r-- | Documentation/git-am.txt | 8 | ||||
| -rw-r--r-- | Documentation/git-mailsplit.txt | 13 |
2 files changed, 15 insertions, 6 deletions
diff --git a/Documentation/git-am.txt b/Documentation/git-am.txt index ba79773f7..25cf84a0c 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 diff --git a/Documentation/git-mailsplit.txt b/Documentation/git-mailsplit.txt index c11d6a530..abb090369 100644 --- a/Documentation/git-mailsplit.txt +++ b/Documentation/git-mailsplit.txt @@ -7,12 +7,15 @@ git-mailsplit - Simple UNIX mbox splitter program SYNOPSIS -------- -'git-mailsplit' [-b] [-f<nn>] [-d<prec>] -o<directory> [--] [<mbox>...] +'git-mailsplit' [-b] [-f<nn>] [-d<prec>] -o<directory> [--] [<mbox>|<Maildir>...] DESCRIPTION ----------- -Splits a mbox file into a list of files: "0001" "0002" .. in the specified -directory so you can process them further from there. +Splits a mbox file or a Maildir into a list of files: "0001" "0002" .. in the +specified directory so you can process them further from there. + +IMPORTANT: Maildir splitting relies upon filenames being sorted to output +patches in the correct order. OPTIONS ------- @@ -20,6 +23,10 @@ OPTIONS Mbox file to split. If not given, the mbox is read from the standard input. +<Maildir>:: + Root of the Maildir to split. This directory should contain the cur, tmp + and new subdirectories. + <directory>:: Directory in which to place the individual messages. |