Turns out "git pull --rebase" sucks.