Merge some gitconfig settings