rebase: fix "rebase --continue" breakage

diff --git a/git-rebase.sh b/git-rebase.sh
index c02be31f33179dcd87238ec77ad32d572b1da510..c059749bbd5bc1e5bf4103c09b4935c46c965431 100755 (executable)
--- 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)