Reverting to a specific sha or commit

git rollback revert
Oscar Godson picture Oscar Godson · Nov 17, 2011 · Viewed 14.7k times · Source

I'm trying to revert to a specific commit ( 3d5575f8e4c97ddab8ad5d540fee4664c04db75d ), but when i do:

git revert 3d5575f8e4c97ddab8ad5d540fee4664c04db75d

it says:

fatal: 'revert' is not possible because you have unmerged files.
Please, fix them up in the work tree, and then use 'git add/rm <file>' as
appropriate to mark resolution and make a commit, or use 'git commit -a'.

I don't care those changes, and I also want to lose those changes, revert to that commit (soft revert, dont want to lose the files) THEN repull down changes. My local stuff is all messed up. Any help?

Answer

DanR picture DanR · Nov 17, 2011

I think you want to use git reset 3d5575f8e4c97ddab8ad5d540fee4664c04db75d. This will keep your working files as is, but reset your HEAD to the commit you specified. Additionally, it should reset your index as well (clears out files you have selected to commit, add, remove, etc).

If you want to get rid of all the changes to your working files, use git reset --hard 3d5575f8e4c97ddab8ad5d540fee4664c04db75d.

Related questions

How to discard all changes made to a branch?

I'm working in a branch (i.e. design) and I've made a number of changes, but I need to discard them all and reset it to match the repository version. I thought git checkout design would do it, but it …

Read More
Git rollback 1 pull

I have a web server that serves a project that is a git repository. When I do some changes to the code I then do a git pull from the server. Sometimes the new code just crashes, I would like …

Read More
Going back to a previous commit in Gitkraken

My programming partner and I, being fairly new to Git and Gitkraken, made some mistakes, did some pushes pulls and commits in the wrong order, and got things fairly bungled up. I would like to go get a snapshot from …

Read More