git config
osx settings
trying out pull.rebase for a while