Now that the sequencer learned to process a "normal" interactive rebase,
we use it. The original shell script is still used for "non-normal"
interactive rebases, i.e. when --root or --preserve-merges was passed.

Please note that the --root option (via the $squash_onto variable) needs
special handling only for the very first command, hence it is still okay
to use the helper upon continue/skip.

Also please note that the --no-ff setting is volatile, i.e. when the
interactive rebase is interrupted at any stage, there is no record of
it. Therefore, we have to pass it from the shell script to the

Signed-off-by: Johannes Schindelin <>
--- | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/ b/
index 7e558b0..022766b 100644
--- a/
+++ b/
@@ -1059,6 +1059,10 @@ git_rebase__interactive () {
 case "$action" in
+       if test ! -d "$rewritten"
+       then
+               exec git rebase--helper ${force_rebase:+--no-ff} --continue
+       fi
        # do we have anything to commit?
        if git diff-index --cached --quiet HEAD --
@@ -1118,6 +1122,10 @@ first and then run 'git rebase --continue' again.")"
        git rerere clear
+       if test ! -d "$rewritten"
+       then
+               exec git rebase--helper ${force_rebase:+--no-ff} --continue
+       fi
        return 0
@@ -1307,6 +1315,11 @@ expand_todo_ids
 test -d "$rewritten" || test -n "$force_rebase" || skip_unnecessary_picks
+if test -z "$rebase_root" && test ! -d "$rewritten"
+       require_clean_work_tree "rebase"
+       exec git rebase--helper ${force_rebase:+--no-ff} --continue

Reply via email to