Merge pull request #1 from haribote/master

Merge branch 'update-gitconfig-1'