summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2011-08-19 05:07:54 (GMT)
committerJunio C Hamano <gitster@pobox.com>2011-08-19 05:07:54 (GMT)
commitd8308c79fc2cae2d1891f92b9e0f9ec0361fe7df (patch)
tree25598aff5456212a2ea45cff89c72fd49dc5a848
parent7c10882c0d299b5d1dbe2c633e95c91ca6152197 (diff)
parent2ae7345ab290ea1357c0b2f1901ef531c9f59e5b (diff)
downloadgit-d8308c79fc2cae2d1891f92b9e0f9ec0361fe7df.zip
git-d8308c79fc2cae2d1891f92b9e0f9ec0361fe7df.tar.gz
git-d8308c79fc2cae2d1891f92b9e0f9ec0361fe7df.tar.bz2
Merge branch 'ma/am-exclude'
* ma/am-exclude: am: Document new --exclude=<path> option am: pass exclude down to apply
-rw-r--r--Documentation/git-am.txt4
-rwxr-xr-xgit-am.sh3
2 files changed, 5 insertions, 2 deletions
diff --git a/Documentation/git-am.txt b/Documentation/git-am.txt
index 6b1b5af..887466d 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
diff --git a/git-am.sh b/git-am.sh
index 6592424..57150eb 100755
--- a/git-am.sh
+++ b/git-am.sh
@@ -22,6 +22,7 @@ whitespace= pass it through git-apply
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
C= pass it through git-apply
p= pass it through git-apply
patch-format= format the patch(es) are in
@@ -366,7 +367,7 @@ do
;;
--resolvemsg)
shift; resolvemsg=$1 ;;
- --whitespace|--directory)
+ --whitespace|--directory|--exclude)
git_apply_opt="$git_apply_opt $(sq "$1=$2")"; shift ;;
-C|-p)
git_apply_opt="$git_apply_opt $(sq "$1$2")"; shift ;;