Merge branch 'sb/maint-octopus' into maint-1.6.5

diff --git a/git-rebase--interactive.sh b/git-rebase--interactive.sh
index 3853b513b55820d316db436373742af5bb26e6b7..5014ae0579753a09d0c52742d0d0ddb8db5ac8c9 100755 (executable)
--- a/git-rebase--interactive.sh
+++ b/git-rebase--interactive.sh
@@ -770,7 +770,7 @@ EOF
 
                cp "$TODO" "$TODO".backup
                git_editor "$TODO" ||
-                       die "Could not execute editor"
+                       die_abort "Could not execute editor"
 
                has_action "$TODO" ||
                        die_abort "Nothing to do"