Merge branch 'js/rebase-am'

diff --git a/git-rebase--common.sh b/git-rebase--common.sh
index dc18c682fa415c4ed73d0c0edfc1ad01e24b4a29..f00e13e5d04df09558dba65afd4fe1ed44375fa9 100644 (file)
--- a/git-rebase--common.sh
+++ b/git-rebase--common.sh
@@ -19,6 +19,7 @@ write_basic_state () {
                "$state_dir"/allow_rerere_autoupdate
        test -n "$gpg_sign_opt" && echo "$gpg_sign_opt" > "$state_dir"/gpg_sign_opt
        test -n "$signoff" && echo "$signoff" >"$state_dir"/signoff
+       test -n "$reschedule_failed_exec" && : > "$state_dir"/reschedule-failed-exec
 }
 
 apply_autostash () {