git merge --no-ff by default, yay!