Remove autosetuprebase = always from .gitconfig