add:.gitconfig
Merge branch 'linux' into osx