summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohannes Berg <johannes@sipsolutions.net>2012-03-28 11:11:28 (GMT)
committerJunio C Hamano <gitster@pobox.com>2012-03-28 17:44:55 (GMT)
commit58725efd4a0583e4a3793b054ebaf57bd40e82fa (patch)
tree5fc2337696a4929a5f428c65be056b98f0f06e09
parent2ae7345ab290ea1357c0b2f1901ef531c9f59e5b (diff)
downloadgit-58725efd4a0583e4a3793b054ebaf57bd40e82fa.zip
git-58725efd4a0583e4a3793b054ebaf57bd40e82fa.tar.gz
git-58725efd4a0583e4a3793b054ebaf57bd40e82fa.tar.bz2
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>
-rw-r--r--Documentation/git-am.txt3
-rwxr-xr-xgit-am.sh3
2 files changed, 4 insertions, 2 deletions
diff --git a/Documentation/git-am.txt b/Documentation/git-am.txt
index 887466d..e4c08e1 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
diff --git a/git-am.sh b/git-am.sh
index 4ea2f2f..2ecccfd 100755
--- a/git-am.sh
+++ b/git-am.sh
@@ -23,6 +23,7 @@ ignore-space-change pass it through git-apply
ignore-whitespace pass it through git-apply
directory= pass it through git-apply
exclude= pass it through git-apply
+include= pass it through git-apply
C= pass it through git-apply
p= pass it through git-apply
patch-format= format the patch(es) are in
@@ -363,7 +364,7 @@ do
;;
--resolvemsg)
shift; resolvemsg=$1 ;;
- --whitespace|--directory|--exclude)
+ --whitespace|--directory|--exclude|--include)
git_apply_opt="$git_apply_opt $(sq "$1=$2")"; shift ;;
-C|-p)
git_apply_opt="$git_apply_opt $(sq "$1$2")"; shift ;;