summaryrefslogtreecommitdiff
path: root/git-am.sh
diff options
context:
space:
mode:
authorJunio C Hamano <junkio@cox.net>2007-02-11 22:05:36 -0800
committerJunio C Hamano <junkio@cox.net>2007-02-11 22:05:36 -0800
commit2092a1fefdacf9839332202fa62165e2ac91c899 (patch)
tree59a28d8ea65428fd6410b19eb9b5c63b64331d43 /git-am.sh
parentc5c3fc9851e6c89f8616729552d9b8a8dfea5555 (diff)
downloadgit-2092a1fefdacf9839332202fa62165e2ac91c899.tar.gz
Teach git-am to pass -p option down to git-apply
This is originally from Andy Parkins whose patch used --patchdepth; let's use -p which is more in line with the underlying git-apply. Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 'git-am.sh')
-rwxr-xr-xgit-am.sh7
1 files changed, 2 insertions, 5 deletions
diff --git a/git-am.sh b/git-am.sh
index 9a6123437e..6db9cb503a 100755
--- a/git-am.sh
+++ b/git-am.sh
@@ -3,7 +3,7 @@
# Copyright (c) 2005, 2006 Junio C Hamano
USAGE='[--signoff] [--dotest=<dir>] [--utf8 | --no-utf8] [--binary] [--3way]
- [--interactive] [--whitespace=<option>] [-CNUM] <mbox>...
+ [--interactive] [--whitespace=<option>] [-C<n>] [-p<n>] <mbox>...
or, when resuming [--skip | --resolved]'
. git-sh-setup
set_reflog_action am
@@ -142,10 +142,7 @@ do
--sk|--ski|--skip)
skip=t; shift ;;
- --whitespace=*)
- git_apply_opt="$git_apply_opt $1"; shift ;;
-
- -C*)
+ --whitespace=*|-C*|-p*)
git_apply_opt="$git_apply_opt $1"; shift ;;
--resolvemsg=*)