From: Kevin Ballard Date: Fri, 29 Aug 2008 22:27:50 GMT Subject: [PATCH] git-am: Pass the --directory option through to git-apply Message-ID: <1220048870-97641-1-git-send-email-kevin@sb.org> Signed-off-by: Kevin Ballard --- Documentation/git-am.txt | 1 + git-am.sh | 3 ++- 2 files changed, 3 insertions(+), 1 deletions(-) diff --git a/Documentation/git-am.txt b/Documentation/git-am.txt index b9c6fac..64c8178 100644 --- a/Documentation/git-am.txt +++ b/Documentation/git-am.txt @@ -66,6 +66,7 @@ default. You could use `--no-utf8` to override this. -C:: -p:: +--directory=:: These flags are passed to the 'git-apply' (see linkgit:git-apply[1]) program that applies the patch. diff --git a/git-am.sh b/git-am.sh index aa60261..7e7a86f 100755 --- a/git-am.sh +++ b/git-am.sh @@ -18,6 +18,7 @@ k,keep pass -k flag to git-mailinfo whitespace= pass it through git-apply C= pass it through git-apply p= pass it through git-apply +directory= pass it through git-apply resolvemsg= override error message when patch failure occurs r,resolved to be used after a patch failure skip skip the current patch @@ -155,7 +156,7 @@ do ;; --resolvemsg) shift; resolvemsg=$1 ;; - --whitespace) + --whitespace|--directory) git_apply_opt="$git_apply_opt $1=$2"; shift ;; -C|-p) git_apply_opt="$git_apply_opt $1$2"; shift ;; -- 1.6.0.1.207.g020e5.dirty