Always supply --no-ff to merge.