mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

add -C[NUM] to git-am

Browse Source 
Add -C[NUM] to git-am and git-rebase so that patches can be applied even
if context has changed a bit.

Signed-off-by: Michael S. Tsirkin <mst@mellanox.co.il>
Signed-off-by: Junio C Hamano <junkio@cox.net>
This commit is contained in:
Michael S. Tsirkin
2007-02-08 15:57:08 +02:00
committed by Junio C Hamano
parent 66e788bc7f
commit 67dad687ad
4 changed files with 25 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
git-am.sh
View File

@ -3,7 +3,7 @@
# Copyright (c) 2005, 2006 Junio C Hamano
USAGE='[--signoff] [--dotest=<dir>] [--utf8 | --no-utf8] [--binary] [--3way]
[--interactive] [--whitespace=<option>] <mbox>...
[--interactive] [--whitespace=<option>] [-CNUM] <mbox>...
or, when resuming [--skip | --resolved]'
. git-sh-setup
set_reflog_action am
@ -106,7 +106,8 @@ It does not apply to blobs recorded in its index."
}
prec=4
dotest=.dotest sign= utf8=t keep= skip= interactive= resolved= binary= ws= resolvemsg=
dotest=.dotest sign= utf8=t keep= skip= interactive= resolved= binary= resolvemsg=
git_apply_opt=
while case "$#" in 0) break;; esac
do
@ -142,7 +143,10 @@ do
skip=t; shift ;;
--whitespace=*)
ws=$1; shift ;;
git_apply_opt="$git_apply_opt $1"; shift ;;
-C*)
git_apply_opt="$git_apply_opt $1"; shift ;;
--resolvemsg=*)
resolvemsg=$(echo "$1" | sed -e "s/^--resolvemsg=//"); shift ;;
@ -394,7 +398,7 @@ do
case "$resolved" in
'')
git-apply $binary --index $ws "$dotest/patch"
git-apply $git_apply_opt $binary --index "$dotest/patch"
apply_status=$?
;;
t)