diff options
| author | Junio C Hamano <gitster@pobox.com> | 2012-04-20 15:49:15 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2012-04-20 15:49:16 -0700 |
| commit | 334dde8532c68dfcadefbc3a7d96a499c0ec1445 (patch) | |
| tree | 2b8b51693d416a9cc0760840bba65431d3e02c53 /Documentation/git-am.txt | |
| parent | 503c15ac0921338ef7e9e0ff4a6c9fcc18b2d8d5 (diff) | |
| parent | 58725efd4a0583e4a3793b054ebaf57bd40e82fa (diff) | |
| download | git-334dde8532c68dfcadefbc3a7d96a499c0ec1445.tar.gz | |
Merge branch 'jb/am-include'
"git am" learned the "--include" option, which is an opposite of existing
the "--exclude" option.
By Johannes Berg
* jb/am-include:
am: support --include option
Diffstat (limited to 'Documentation/git-am.txt')
| -rw-r--r-- | Documentation/git-am.txt | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/Documentation/git-am.txt b/Documentation/git-am.txt index ee6cca2e13..19d57a80f5 100644 --- a/Documentation/git-am.txt +++ b/Documentation/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 |