delete --no-ff
delete --no-ff