Git Undo Uncommitted Fast Forward Merges

This can only happen when there are conflicts. Fast forward merges are otherwise auto-committed.

git merge --abort

Reference: http://stackoverflow.com/questions/5741407/how-to-undo-a-git-merge-with-conflicts