git merge --no-ff feature-xyz
Category: Git - Core
Merge creating a merge commit even if fast-forward possible