summaryrefslogtreecommitdiff
path: root/git-am.sh
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2011-08-18 22:07:54 -0700
committerJunio C Hamano <gitster@pobox.com>2011-08-18 22:07:54 -0700
commitd8308c79fc2cae2d1891f92b9e0f9ec0361fe7df (patch)
tree25598aff5456212a2ea45cff89c72fd49dc5a848 /git-am.sh
parent7c10882c0d299b5d1dbe2c633e95c91ca6152197 (diff)
parent2ae7345ab290ea1357c0b2f1901ef531c9f59e5b (diff)
downloadgit-d8308c79fc2cae2d1891f92b9e0f9ec0361fe7df.tar.gz
Merge branch 'ma/am-exclude'
* ma/am-exclude: am: Document new --exclude=<path> option am: pass exclude down to apply
Diffstat (limited to 'git-am.sh')
-rwxr-xr-xgit-am.sh3
1 files changed, 2 insertions, 1 deletions
diff --git a/git-am.sh b/git-am.sh
index 65924246d0..57150eb7ba 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 ;;