diff options
| author | martin f. krafft <madduck@madduck.net> | 2009-01-23 11:31:21 +1100 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2009-01-23 17:00:12 -0800 |
| commit | b80da424a13107c239ed40573fae3d692d19b6cd (patch) | |
| tree | 48fd506aeee6cc46c23f2c0b1ef43db37b382ae0 /Documentation/git-am.txt | |
| parent | d930508903909ad5e700dd25e3858a1b2d69ed12 (diff) | |
| download | git-b80da424a13107c239ed40573fae3d692d19b6cd.tar.gz | |
git-am: implement --reject option passed to git-apply
With --reject, git-am simply passes the --reject option to git-apply and thus
allows people to work with reject files if they so prefer.
Signed-off-by: martin f. krafft <madduck@madduck.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation/git-am.txt')
| -rw-r--r-- | Documentation/git-am.txt | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/Documentation/git-am.txt b/Documentation/git-am.txt index 5cbbe76937..efd311b1ce 100644 --- a/Documentation/git-am.txt +++ b/Documentation/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. |