Added more on undoing merges to my recent post on Git
Merge branch 'source' into wpcom-importer