Comments on: Recovering From a Disasterous Git-rebase mistake

By: Jorge

Jorge — Fri, 29 Jan 2010 12:25:42 +0000

You can use git reflog instead of looking at the log manually

By: Vijay

Vijay — Tue, 22 Dec 2009 18:28:46 +0000

Thanks much for this! Saved me from losing a heavy commit!

By: Como recuperar um git rebase mal feito « Tino Gomes

Como recuperar um git rebase mal feito « Tino Gomes — Thu, 23 Jul 2009 04:51:06 +0000

[...] pelo famosíssimo Guanabara em um dos guanacasts sobre SEO (parte I e parte II), onde encontrei um post de Greg DeVore, explicando como recuperar uma cagada bagunça dessa. E com meus MAD SKIILS, ainda usei o git [...]

By: Soleone

Soleone — Tue, 21 Jul 2009 18:46:12 +0000

Yea, thanks a lot indeed! I lost a pretty heavy commit today, when accidently doing git rebase --skip in the middle of a rebase.

You saved my day man!

By: lucas

lucas — Sat, 11 Jul 2009 02:37:16 +0000

thank you so much. i did exactly what you had done and was near tears when I stumbled upon your blog. saved me 3 days.

By: oglcm

oglcm — Tue, 16 Jun 2009 00:01:11 +0000

I... I can't thank you enough.

To clarify, what you probably want is to open the log for the branch (head) which contained the changes you've lost.

You'll see a couple of rebase messages toward the bottom, it's the line above that which is the last commit you made. The fields seem to be '(new ID) (parent ID) (action): (action specific fields)', so you can "git checkout -b recovery (new ID)" to get back to where you were.

Hope this helps someone else as much as it did me...

By: Greg DeVore

Greg DeVore — Mon, 13 Apr 2009 21:14:29 +0000

So Chris, I'm not clear on what you did. Did you checkout the master branch and then do "git-rebase idofbranchfromgit_logs" ?

By: Chris

Chris — Mon, 13 Apr 2009 20:47:49 +0000

I came across you posting after I had a similar mishap with git-rebase -i/git-rebase -abort that left me with a lot of missing commits.

Your tip on peeking at the .git/logs/refs file pointed me in the right direction. But instead of doing a "git-checkout -b" with the any of dangling commits, I was feeling lucky and tried a git-rebase from my master branch. This restored my entire branch history to the state it was in before the debacle. So thanks for the post!