Always rebase on pulls.