Add merge ff=only to .gitconfig