modify .gitconfig
Merge branch 'master' of github.com:weihong-xad/config
combine mac configs