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>
maximilian attems committed
Aug 3, 2011 at 11:37 UTC
77e9e496a1248085d3bdf50dc23b79b4e7f0d26d
1 file changed
+2
-1
git-am.sh
+2
-1
@@ -22,6 +22,7 @@ whitespace= pass it through git-apply
22
ignore-space-change pass it through git-apply
23
ignore-whitespace pass it through git-apply
24
directory= pass it through git-apply
25
+exclude= pass it through git-apply
26
C= pass it through git-apply
27
p= pass it through git-apply
28
patch-format= format the patch(es) are in
@@ -362,7 +363,7 @@ do
363
;;
364
--resolvemsg)
365
shift; resolvemsg=$1 ;;
365
- --whitespace|--directory)
366
+ --whitespace|--directory|--exclude)
367
git_apply_opt="$git_apply_opt $(sq "$1=$2")"; shift ;;
368
-C|-p)
369
git_apply_opt="$git_apply_opt $(sq "$1$2")"; shift ;;