Set git merge --no-ff by default