merge: refuse --commit with --squash