Recovering a git reset --soft

git reset
kriver picture kriver · Jan 4, 2011 · Viewed 8.8k times · Source

I modified some files in my branch and did a 

git add --all

But this added some files that I didn't intend to add for the commit.

So I did a 

git reset --soft HEAD~2 (instead of doing git reset HEAD)

But the previous commit was made by someone else and it caused a lot of files to be in modified/added/deleted status. Is there a way to get back to a stage where the only changes I see are the files added/modified by me? Since I didnt make an actual commit, is there a way to move my head back to master without blowing away my changes? git pull is causing merge conflicts as I didn't actually commit my changes.

Thanks!

Answer

Kzqai picture Kzqai · Jan 4, 2011

For future reference, you can review the commits that your behavior causes or leaves behind by calling git reflog , which will include commits that are no longer in your working tree.

Related questions

In plain English, what does "git reset" do?

I have seen interesting posts explaining subtleties about git reset. Unfortunately, the more I read about it, the more it appears that I don't understand it fully. I come from a SVN background and Git is a whole new paradigm. …

Read More
How to git reset --hard a subdirectory?

UPDATE²: With Git 2.23 (August 2019), there's a new command git restore that does this, see the accepted answer. UPDATE: This will work more intuitively as of Git 1.8.3, see my own answer. Imagine the following use case: I want to get rid …

Read More
How to rollback the two previous commits?

Consider this scenario: Developer A does a commit: #n Dev. B does commit #n+1 Dev. A does commit #n+2 and commit #n+3 and then discovers that in his commit #n+2 he introduced a defect. How can dev. A rollback his …

Read More