"git merge --no-ff"?