Comments on: Recovering From a Disasterous Git-rebase mistake

By: Patrick Dobson

Patrick Dobson — Fri, 03 Feb 2012 16:10:01 +0000

This is a pretty good writeup.

I've found that when I do a rebase on a branch more than once (e.g. I create a branch called marketing, make changes, rebase to master, make more changes, and then rebase again) that the branch will actually come into conflict with its own changes. In these cases, I'll do a git rebase and run git rebase --skip for each conflict until the end of the rebase.

What this does is ignore all the conflicts that the branch has with itself, and applies all of the changes of that branch to the parent branch that don't cause any commits.

By: Marc McGarry

Marc McGarry — Thu, 26 Jan 2012 05:54:14 +0000

You’re still helping people far into the future. Thanks : )

By: iVira

iVira — Wed, 07 Dec 2011 17:27:49 +0000

Thanks a lot! It’s saved me a day of work!

By: Wolfgang Teuber

Wolfgang Teuber — Thu, 15 Sep 2011 13:27:55 +0000

Another great THANKS here For your stats: you just saved * 261 LOC * 6.5 h of my life * me * my boss

By: Oliver Coleman

Oliver Coleman — Wed, 27 Apr 2011 06:02:51 +0000

Thanks!

I think the mistake I made was to skip some of the diffs during the rebase, thinking that the one file it complained about a conflict for was the only file referenced for that diff. Lo and behold when the rebase was "complete", minus skipped diffs, there were many missing pieces I had painstakingly created, not just the file with a conflict!

Cheers, Oliver

By: VInay

VInay — Sat, 05 Feb 2011 02:40:03 +0000

Thanks. You saved my day.

By: Brent Douglas

Brent Douglas — Fri, 17 Dec 2010 03:34:16 +0000

Thanks man. Massive help.

By: Stefan Huska

Stefan Huska — Tue, 07 Sep 2010 19:59:44 +0000

Thanks, you helped me a lot! :)

By: Ian Lotinsky

Ian Lotinsky — Fri, 27 Aug 2010 17:42:12 +0000

Thank you, thank you, thank you. You just saved 5 hours of my life from being needlessly wasted.

By: Anders Bohn Jespersen

Anders Bohn Jespersen — Thu, 12 Aug 2010 08:39:49 +0000

Thank you very much!

After using rebase -i on a branch (in a sort of haphazard, happy go lucky way :-), most changes were disappeared.

I found the commit-id in ".git/logs/refs/"

By: Lukas

Lukas — Tue, 06 Jul 2010 19:33:15 +0000

OMG! Thanks! Btw, I don't know why, but in my case logs in .git/logs/refs allowed me to restore almost the same version I lost. Inside .git/logs/HEAD file I found different sha and I got exaclly what i wanted.

And one thing. I lost my commits by doing git add -i git rebase -i origin/branch git rebase --abort (due to fake info about already stared rebasing)

TBH I'm not sure I made commit after git add -i Maybe missing commit operation were the reason.

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!