update .gitconfig for merge/pull default settings.