git config branch.autosetuprebase always

Hooray!