Set --no-ff by default