Use autosetuprebase

Execute this command to enable autosetuprebase in your environment:

git config --global branch.autosetuprebase always

Check out this blog to see how rebase avoids merge commits, and read this article which explains why autosetuprebase is a good idea.