Git reset current rebase

Question

I've been doing a rebase. I've worked on fixing some conflicts but I've ended up going in the wrong direction and now I just want to start again fixing these conflicts.

I'd like to reset the rebase, so that I'm still rebasing the current commit but the working copy has been reset to when the commit was flagged up with conflicts in the first place.

How can I reset a rebase on the current commit?

Answer 1

If you are in between your rebase, you can do

git rebase --abort

Answer 2

First, clear the mess:

git reset --hard HEAD

Then, cherry-pick the commit you are currently rebasing:

git cherry-pick -n `git rev-parse REBASE_HEAD`

That's it. As usual, you will be able to continue the rebase after fixing conflicts.