Merging my own gitconfig