created: 20150312123759865 creator: user modified: 20150312123927681 modifier: user tags: git title: Git Cheats type: text/vnd.tiddlywiki * http://git-scm.com/blog/2010/03/02/undoing-merges.html * https://github.com/k88hudson/git-flight-rules * http://blackbe.lt/common-git-problems-and-solutions/ * http://stackoverflow.com/questions/2389361/undo-a-git-merge