Add merge.ff false to home/.gitconfig