"merge --no-ff" by default on master.