aboutsummaryrefslogtreecommitdiff
path: root/git-am.sh
diff options
context:
space:
mode:
authormaximilian attems <max@stro.at>2011-08-03 11:37:29 +0200
committerJunio C Hamano <gitster@pobox.com>2011-08-03 11:21:46 -0700
commit77e9e496a1248085d3bdf50dc23b79b4e7f0d26d (patch)
tree8060d8d1e0e0a4d049a481befa735de3c3095c5c /git-am.sh
parent3503b8d0da61d920ebd9294fd6a9a0f758328fd3 (diff)
downloadgit-77e9e496a1248085d3bdf50dc23b79b4e7f0d26d.tar.gz
git-77e9e496a1248085d3bdf50dc23b79b4e7f0d26d.tar.xz
am: pass exclude down to apply
This allows to pass patches around from repositories, where the other repository doesn't feature certain files. In the special case this works for dash git sync to klibc dash: git am --directory="usr/dash" --exclude="usr/dash/configure.ac" \ --exclude="usr/dash/ChangeLog" --exclude="usr/dash/dash.1" \ .. -i -s -k ../dash/000X-foo.patch Signed-off-by: maximilian attems <max@stro.at> Signed-off-by: Junio C Hamano <gitster@pobox.com>
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 6cdd5910d..4ea2f2fe0 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
@@ -362,7 +363,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 ;;