More gitconfig refactoring