gitconfig updates to use diffmerge and push matching