I like `git pull --rebase`