diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2011-08-18 22:07:54 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2011-08-18 22:07:54 -0700 |
| commit | d8308c79fc2cae2d1891f92b9e0f9ec0361fe7df (patch) | |
| tree | 25598aff5456212a2ea45cff89c72fd49dc5a848 /Documentation | |
| parent | Merge branch 'maint' (diff) | |
| parent | am: Document new --exclude=<path> option (diff) | |
| download | tgif-d8308c79fc2cae2d1891f92b9e0f9ec0361fe7df.tar.xz | |
Merge branch 'ma/am-exclude'
* ma/am-exclude:
am: Document new --exclude=<path> option
am: pass exclude down to apply
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/git-am.txt | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/Documentation/git-am.txt b/Documentation/git-am.txt index 6b1b5af64e..887466d777 100644 --- a/Documentation/git-am.txt +++ b/Documentation/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 |