Get rid of spurious rebase errors.

Based on this article:
http://www.git-tower.com/blog/make-git-rebase-safe-on-osx/