Merge no fast-forward

Git
git merge --no-ff <branch>