From d5e673b60be2eb99153276366b6b5ff3277805df Mon Sep 17 00:00:00 2001 From: Eric Wong Date: Sat, 24 Jun 2006 18:29:49 -0700 Subject: rebase: allow --skip to work with --merge Now that we control the merge base selection, we won't be forced into rolling things in that we wanted to skip beforehand. Also, add a test to ensure this all works as intended. Signed-off-by: Eric Wong Signed-off-by: Junio C Hamano --- git-rebase.sh | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) (limited to 'git-rebase.sh') diff --git a/git-rebase.sh b/git-rebase.sh index a95ada6b14..9ad1c44d48 100755 --- a/git-rebase.sh +++ b/git-rebase.sh @@ -137,7 +137,18 @@ do --skip) if test -d "$dotest" then - die "--skip is not supported when using --merge" + prev_head="`cat $dotest/prev_head`" + end="`cat $dotest/end`" + msgnum="`cat $dotest/msgnum`" + msgnum=$(($msgnum + 1)) + onto="`cat $dotest/onto`" + while test "$msgnum" -le "$end" + do + call_merge "$msgnum" + continue_merge + done + finish_rb_merge + exit fi git am -3 --skip --resolvemsg="$RESOLVEMSG" exit -- cgit v1.3