When running ‘git rebase -i --autostash’ if the editor fails then the rebase fails but stash is not applied so the working files are not restored. Running ‘git rebase --abort’ replies that there’s no rebase in progress. If you notice what’s happened it’s not a problem if you know to do ‘git stash apply <autostash id>’ but it’s confusing as normally the stash would be automatically applied. This happened to me when I messed up my editor configuration but you can reproduce it with $ GIT_SEQUENCE_EDITOR=false git rebase -i --autostash HEAD^^ Created autostash: ff960d4 HEAD is now at f1b8af7 [git] Turn on rebase.missingCommitsCheck Could not execute editor $ git rebase --abort No rebase in progress? Best Wishes Phillip -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html