add .gitconfig
Merge branch 'master' into cygwin