aboutsummaryrefslogtreecommitdiff
path: root/Documentation/git-am.txt
diff options
context:
space:
mode:
authorJohannes Berg <johannes@sipsolutions.net>2012-03-28 13:11:28 +0200
committerJunio C Hamano <gitster@pobox.com>2012-03-28 10:44:55 -0700
commit58725efd4a0583e4a3793b054ebaf57bd40e82fa (patch)
tree5fc2337696a4929a5f428c65be056b98f0f06e09 /Documentation/git-am.txt
parent2ae7345ab290ea1357c0b2f1901ef531c9f59e5b (diff)
downloadgit-58725efd4a0583e4a3793b054ebaf57bd40e82fa.tar.gz
git-58725efd4a0583e4a3793b054ebaf57bd40e82fa.tar.xz
am: support --include option
am supports a number of pass-through options to apply, like --exclude and --directory. Add --include to this list. Signed-off-by: Johannes Berg <johannes@sipsolutions.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation/git-am.txt')
-rw-r--r--Documentation/git-am.txt3
1 files changed, 2 insertions, 1 deletions
diff --git a/Documentation/git-am.txt b/Documentation/git-am.txt
index 887466d77..e4c08e122 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)
@@ -89,6 +89,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