git-pull should do a rebase instead of merge --no-ff