Add --no-ff option to create a merge commit even when the merge resolves as a fast-forward.