Source: https://stackoverflow.com/a/30209750

git config pull.rebase true
git config rebase.autoStash true