tags:

views:

54

answers:

1

Unfortunately I did several times git reset --hard HEAD^ losing a quite big chunk of code in several files. Is there a way to restore those commits or in this case to forward where the HEAD was before, so I can bring up those lines that I lost?

+6  A: 

Use the reflog to recover the sha1 of the previous HEAD. In particular, the article reflog, your safety net will be particularly relevant to you. From that article:

The most common usage of this command is that you’ve just done a git reset and moved your HEAD back a few commits. But oops, you need that bit of code you left in the second commit. Crap. Now what?

Once you have found the sha1 of the commit you want to go back to, use something like:

git reset --hard 0a1b2c
Greg Hewgill
Great! Thanks that did the job perfectly.
Lan
You can also reset to `HEAD@{n}`, finding the appropriate n from the reflog
Michael Mrozek
One can also view the reflog with `git log -g`, which might provide a bit more context than `git reflog show`.
Chris Johnsen