diff --git a/git_rebase_update.py b/git_rebase_update.py index 5c8847440..f3080fe19 100755 --- a/git_rebase_update.py +++ b/git_rebase_update.py @@ -205,6 +205,7 @@ def rebase_branch(branch, parent, start_hash): Your working copy is in mid-rebase. Either: * completely resolve like a normal git-rebase; OR * abort the rebase and mark this branch as dormant: + git rebase --abort && \\ git config branch.%s.dormant true And then run `git rebase-update` again to resume.