edit gitconfig
Merge branch 'master' of github.com:Nashio114/dotfile