update gitconfig with no-ff in global merge