Created
December 6, 2011 11:36
-
-
Save Antiarchitect/1437892 to your computer and use it in GitHub Desktop.
Excluding commit
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
git checkout <last useful commit from bottom> | |
git checkout -b rescue | |
git merge master | |
git checkout master | |
git reset --hard <last useful commit from bottom> | |
git merge --interactive rescue |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment