Skip to content

Instantly share code, notes, and snippets.

@Antiarchitect

Antiarchitect/gist:1437892

Created December 6, 2011 11:36
Show Gist options
  • Star 0 You must be signed in to star a gist
  • Fork 0 You must be signed in to fork a gist
  • Save Antiarchitect/1437892 to your computer and use it in GitHub Desktop.
Save Antiarchitect/1437892 to your computer and use it in GitHub Desktop.
Download ZIP
Excluding commit
Raw
gistfile1.txt
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