merge .gitconfig code from master branch to at-work branch