Update .gitconfig merge command default -no-ff