Screw that, I'll stay with git pull --rebase