diff options
| author | Junio C Hamano <junio@hera.kernel.org> | 2007-05-25 05:01:30 +0000 |
|---|---|---|
| committer | Junio C Hamano <junio@hera.kernel.org> | 2007-05-25 05:01:30 +0000 |
| commit | b7ed57ac09980746fe198f6afd7a72be9702ecda (patch) | |
| tree | 5918196b843e724d0398ebf6f2fd57cec44035a4 /git-am.txt | |
| parent | 7fd841777a3a79f59afbc86aec190e9ab3d49a58 (diff) | |
| download | git-htmldocs-b7ed57ac09980746fe198f6afd7a72be9702ecda.tar.gz | |
Autogenerated HTML docs for v1.5.2-73-g18bece
Diffstat (limited to 'git-am.txt')
| -rw-r--r-- | git-am.txt | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/git-am.txt b/git-am.txt index ba79773f7..25cf84a0c 100644 --- a/git-am.txt +++ b/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 |