Git: Recover from failed rebase

Question

I just tried to rebase one of my feature-branches and something went wrong - now i am trying to figure out how to undo this.

Being on my feature-branch i simply did a: git rebase develop after committing a bugfix on develop which i wanted in the feature-branch as well. This gave me:

$ git rebase develop
First, rewinding head to replay your work on top of it...
Rename from '.git/HEAD.lock' to '.git/HEAD' failed. Should I try again? (y/n)? n

error: Couldn't set HEAD
fatal: Cannot update the ref 'HEAD'.
could not detach HEAD

Well, now i see a bunch of staged files on this branch, but it seems that all commits on this branch are still intact (at least i am not missing one :)

I want to revert this branch to how it looked like before the rebase-attempt. Unfortunately it seems that ORIG_HEAD was not correctly set before the rebase, since i can see it being shown next to a commit on another feature-branch (which i rebased before trying to rebase this feature-branch).

Is a reset to the last visible commit on my current feature-branch the way to go?

--qu

Just linking for future ref: stackoverflow.com/questions/4660521/… — quaylar
– quaylar, Commented Feb 28, 2012 at 12:44

Vi. · Accepted Answer · 2012-02-28 12:23:01Z

4

You can use git reflog to see the what commit it was, copy commit number for there and do git reset --hard <number>

answered Feb 28, 2012 at 12:23

Vi.

39k21 gold badges103 silver badges155 bronze badges

Sign up to request clarification or add additional context in comments.

Collectives™ on Stack Overflow

Git: Recover from failed rebase

1 Answer 1

Comments

Your Answer

Linked

Hot Network Questions

Collectives™ on Stack Overflow

1 Answer 1

Comments

Your Answer

Sign up or log in

Post as a guest

Linked

Related