diff options
| author | Junio C Hamano <jch@google.com> | 2012-04-20 16:50:49 -0700 |
|---|---|---|
| committer | Junio C Hamano <jch@google.com> | 2012-04-20 16:50:49 -0700 |
| commit | 0c1b64ec7505c3f5b7ca8e4ccc69a577adb0b814 (patch) | |
| tree | 2efa0be2dc0a2e29a37742d74adb8f0f1ce751a3 /git-am.txt | |
| parent | d1ace0ce5ca13c2127191ae769f2af3a4196526a (diff) | |
| download | git-htmldocs-0c1b64ec7505c3f5b7ca8e4ccc69a577adb0b814.tar.gz | |
Autogenerated HTML docs for v1.7.10-227-gd1ca7
Diffstat (limited to 'git-am.txt')
| -rw-r--r-- | git-am.txt | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/git-am.txt b/git-am.txt index ee6cca2e1..19d57a80f 100644 --- a/git-am.txt +++ b/git-am.txt @@ -13,7 +13,7 @@ SYNOPSIS [--3way] [--interactive] [--committer-date-is-author-date] [--ignore-date] [--ignore-space-change | --ignore-whitespace] [--whitespace=<option>] [-C<n>] [-p<n>] [--directory=<dir>] - [--exclude=<path>] [--reject] [-q | --quiet] + [--exclude=<path>] [--include=<path>] [--reject] [-q | --quiet] [--scissors | --no-scissors] [(<mbox> | <Maildir>)...] 'git am' (--continue | --skip | --abort) @@ -92,6 +92,7 @@ default. You can use `--no-utf8` to override this. -p<n>:: --directory=<dir>:: --exclude=<path>:: +--include=<path>:: --reject:: These flags are passed to the 'git apply' (see linkgit:git-apply[1]) program that applies |