From 3f735b66543a2221c218fc522272d62a333ebfec Mon Sep 17 00:00:00 2001
From: Johannes Schindelin <Johannes.Schindelin@gmx.de>
Date: Mon, 12 Nov 2007 13:11:46 +0000
Subject: rebase: fix "rebase --continue" breakage

The --skip case was handled properly when rebasing without --merge,
but the --continue case was not.

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
---
 git-rebase.sh | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

(limited to 'git-rebase.sh')

diff --git a/git-rebase.sh b/git-rebase.sh
index c02be31f33..c059749bbd 100755
--- a/git-rebase.sh
+++ b/git-rebase.sh
@@ -170,7 +170,11 @@ do
 			finish_rb_merge
 			exit
 		fi
-		git am --resolved --3way --resolvemsg="$RESOLVEMSG"
+		head_name=$(cat .dotest/head-name) &&
+		onto=$(cat .dotest/onto) &&
+		orig_head=$(cat .dotest/orig-head) &&
+		git am --resolved --3way --resolvemsg="$RESOLVEMSG" &&
+		move_to_original_branch
 		exit
 		;;
 	--skip)
-- 
cgit v1.2.3