如何在git中“撤消撤消”？

Question

To reset my last commit, I did this:

git reset --soft HEAD^

But I did it too many times. Now I want to go back forward a couple. Is that possible?

Also, I had a developer pull and merge code on a production application that completely hosed up everything. Then to fix it, he manually overwrote some files in the app source. There are bad commits. The applications is not functioning.

Is there some way to do a hard reset to a particular point in time in Git? I am not familiar enough with it.

Answer 1

Use git reflog to see where you were and reset to that. (or use notation like HEAD@{1} in reset )

For the other issue, from git log get the hash of the commit you want to reset to and do git reset --hard <sha1> . Or you can even do git reset --hard HEAD@{1 day ago} etc. if you wanted to reset to some commit some time in the past. Since you are rewriting history, you will have to do a force push - git push -f

Also, why are developers pushing to production? Have gates - CI, testing, etc.

Answer 2

Is there some way to do a hard reset to a particular point in time in Git?

Yes. git reset --hard <SHA1-id-of-the-commit-you-want-to-hard-reset-to>

See here (Undoing in Git - Reset, Checkout and Revert) for more on git reset . To learn the basics of data recovery, please see here: Data Recovery Section in Chapter 9 of ProGit book .

Few more hints on how to undo things in git .