Comment by kbenson

I've always found this flowchart[1] wonderful and concise for handling this problem (that is, how do I fix the problem I've made for myself with git)..

1: http://justinhileman.info/article/git-pretty/