This is why git rebase is a horrible horrible thing. (http://whatthecommit.com)