Abort and Continue

Abort and Continue

Aborting and Continuing a Rebase Safely

A stopped rebase leaves the repository in a special state, and git status says where you are:

Checking the state of a stopped rebase, then finishing itShell

git status
git add app.js
GIT_EDITOR=true git rebase --continue

Output

interactive rebase in progress; onto 1821d5c
...
You are currently rebasing branch 'paginate-api' on '1821d5c'.
  (fix conflicts and then run "git rebase --continue")
  (use "git rebase --skip" to skip this patch)
  (use "git rebase --abort" to check out the original branch)
...
        both modified:   app.js
...
Successfully rebased and updated refs/heads/paginate-api.

Even a plain git rebase reports "interactive rebase in progress": the merge backend runs the same todo machinery, keeps its state in .git/rebase-merge/, and detaches HEAD until it ends. Your ways out:

--continue, after staging the resolution, replays the next commit.
--skip drops the current commit, for example one whose change main already contains.
--abort restores the branch exactly as it was before the rebase.
--quit stops but leaves HEAD where it is, rarely what you want.

After a rebase finishes, git reset --hard ORIG_HEAD (rerere) or the reflog (Undoing a Bad Rebase) undoes it.

MENU