going with the version of gitconfig from master