To always do rebase on pull, add the following to the your ~/.gitconfig