diff options
| author | Junio C Hamano <junio@kernel.org> | 2011-08-19 06:50:43 +0000 |
|---|---|---|
| committer | Junio C Hamano <junio@kernel.org> | 2011-08-19 06:50:43 +0000 |
| commit | dac21e7333da9c0b88a8a90a04ba0b3c3a195223 (patch) | |
| tree | 1bdc79b44d5a8edfc24d7aff57b7a130dea928da /git-am.txt | |
| parent | f727901f143d965c00ad283c9cfaee214464e9fd (diff) | |
| download | git-htmldocs-dac21e7333da9c0b88a8a90a04ba0b3c3a195223.tar.gz | |
Autogenerated HTML docs for v1.7.6-557-gcee4
Diffstat (limited to 'git-am.txt')
| -rw-r--r-- | git-am.txt | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/git-am.txt b/git-am.txt index 6b1b5af64..887466d77 100644 --- a/git-am.txt +++ b/git-am.txt @@ -13,7 +13,8 @@ SYNOPSIS [--3way] [--interactive] [--committer-date-is-author-date] [--ignore-date] [--ignore-space-change | --ignore-whitespace] [--whitespace=<option>] [-C<n>] [-p<n>] [--directory=<dir>] - [--reject] [-q | --quiet] [--scissors | --no-scissors] + [--exclude=<path>] [--reject] [-q | --quiet] + [--scissors | --no-scissors] [(<mbox> | <Maildir>)...] 'git am' (--continue | --skip | --abort) @@ -87,6 +88,7 @@ default. You can use `--no-utf8` to override this. -C<n>:: -p<n>:: --directory=<dir>:: +--exclude=<path>:: --reject:: These flags are passed to the 'git apply' (see linkgit:git-apply[1]) program that applies |