Make --no-ff the default merge strategy