Revert "Add config to perform a rebase with git pull"
Revert "Add config to perform a rebase with git pull"

This reverts commit 1fa99915d658b64701dd0515ff8f7d1af208d523.
It's better to use rebase explicitly if you want to.

aasare/aaku