diff options
| author | Junio C Hamano <junio@hera.kernel.org> | 2009-01-24 08:05:18 +0000 |
|---|---|---|
| committer | Junio C Hamano <junio@hera.kernel.org> | 2009-01-24 08:05:18 +0000 |
| commit | 22bcc112adfbdb908fb26cbdb2a89b0db95652a4 (patch) | |
| tree | 3ccdb64b3defb01a8247755cbf2af2fcc8db00eb /git-am.txt | |
| parent | cc0cb3165acf037c2894084b377781b8fbce6c12 (diff) | |
| download | git-htmldocs-22bcc112adfbdb908fb26cbdb2a89b0db95652a4.tar.gz | |
Autogenerated HTML docs for v1.6.1-284-g5dc13
Diffstat (limited to 'git-am.txt')
| -rw-r--r-- | git-am.txt | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/git-am.txt b/git-am.txt index 5cbbe7693..efd311b1c 100644 --- a/git-am.txt +++ b/git-am.txt @@ -12,6 +12,7 @@ SYNOPSIS 'git am' [--signoff] [--keep] [--utf8 | --no-utf8] [--3way] [--interactive] [--whitespace=<option>] [-C<n>] [-p<n>] [--directory=<dir>] + [--reject] [<mbox> | <Maildir>...] 'git am' (--skip | --resolved | --abort) @@ -63,6 +64,7 @@ default. You could use `--no-utf8` to override this. -C<n>:: -p<n>:: --directory=<dir>:: +--reject:: These flags are passed to the 'git-apply' (see linkgit:git-apply[1]) program that applies the patch. |