Undo "Reset current branch to this commit"

I am new with this tool, I've never used GIT neither.

I had a merge conflict... so I was messing with SourceTree and I did a hard "reset current branch to this commit" and ended with my code resetted and all my changes lost.

image2014-11-24 23:23:42.png

Is there a way that I could revert or undo this?

Thanks a lot.

2 answers

10 votes

Hi Im,

Don't panic! Losing work sucks, but there absolutely is a way to recover any previously committed changes Fortunately git is pretty good about not losing things, even if you've done a hard reset.

You'll need to use a git built-in tool called the reflog. Sourcetree doesn't yet support it, so you'll need to open your repository from the command line (and install git, if you haven't already).

Once you're in your repository, run the command git reflog to show a list of ref updates that you've made to your local repository. If the "reset" is the last change you made, it should look something like this:

$ git reflog

62eda16 HEAD@{0}: reset: moving to 62eda16

badcafe HEAD@{1}: blah blah blah

abc1234 HEAD@{2}: something something

You'll want to reset your branch (again) to the commit that it was pointing at before you ran the reset command. In the above example reflog output, this would be HEAD@{1} (badcafe). You can do this by running:

$ git reset badcafe

Hope this helps!

cheers,

Tim

You must be a registered user to add a comment. If you've already registered, sign in. Otherwise, register and sign in.

Comment

Great advice. I just wanted to emphasize that any COMMITTED work has not been lost. If you had anything uncommitted (unlikely, since you said you were working on a merge), then it will have to be recreated. In the future, a "mixed" reset is safer, because it will reset your branch to the selected commit, but it will make no changes to your working copy.

You must be a registered user to add a comment. If you've already registered, sign in. Otherwise, register and sign in.

Comment

Like • Mehmet Şirin Yilmaz likes this

Excellent point @Seth. There is some [dark magic|http://www.reddit.com/r/git/comments/2byaww/ok_i_really_screwed_up_i_did_a_git_rm_f_on_an/] you can use if the work was added to the index but not committed too, although it's not quite as straight forward as a reset.

You must be a registered user to add a comment. If you've already registered, sign in. Otherwise, register and sign in.

Comment

Thanks a lot for your answers... and I am sorry to say that none of my changes were committed and neither added to GIT... So I think I will have to try to recover the files from disk (if they were not rewritten) and surely I will have a long long night... Again, thanks a lot.