tags:

views:

37

answers:

1
+2  Q: 

Restore a previous git commit?

Apparently some old bug fix commit of mine got dropped during a recent merge of old branch into new. I found the commit in the logs and have the ID (403357cab89465ce68001762d35fe27b57aeec65). Now I just want to restore that commit to the current working branch so I can firstly diff those changes but likely commit them all in again. How can I do this?

git checkout 403357cab89465ce68001762d35fe27b57aeec65

doesn't work.

And by the way, the commit involved edits to multiple files.

+4  A: 

Do a git cherry-pick sha1 and it will pull that commit on top of your current HEAD.

Daenyth  2010-09-28 17:38:46
oh wow, that basically took the commit and plugged it right back in! thanks, but was hoping to see the changes staged first so i could diff them, verify i need them, etc. before deciding to commmit.
Doug  2010-09-28 17:48:27
You can do `git reset HEAD^` now to leave the changes in your working copy but remove the commit (assuming you have not pushed). Also, you can mark an answer as accepted in the system here by clicking the check mark :)
Daenyth  2010-09-28 18:03:59

related questions

How to have two remote orgins for Git?
Why is branching and merging easier in Mercurial than in Subversion?
Is there a better way of writing a git pre-commit hook to check any php file in a commit for parse errors ?
Bug tracker setup with Git integration?
Does git have anything like `svn propset svn:keywords` or pre-/post-commit hooks?
git-stash vs. git-branch
Git "bad sha1 file" error
Should I use GitHub+Fogbugz or Assembla?
How do you remove a specific revision in the git history?
How do you organise multiple git repositories?
What is the Difference Between Mercurial and Git?
How do I restore files to previous states in git?
Is there anything like TortoiseCVS and TortoiseSVN for git?
Good Git repository viewer for Mac
Deploying a Git subdirectory in Capistrano
How to "unversion" a file in either svn and/or git
How can I graph the Lines of Code history for git repo?
Switch branch names in git
Migrating to GIT
How can I set up an editor to work with Git on Windows?
How do you deal with configuration files in source control?
Undoing a git reset --hard HEAD~1
Version Control. Getting started...
Why is Git better than Subversion?
Distributed source control options