Revert "modified gitconfig"

This reverts commit 850d7f8b92f8a7a1078ccb52abee37cf832cb47e.
modified gitconfig
Merge remote-tracking branch 'upstream/master'