Git - merge no ff
The --no-ff flag causes the merge to always create a new commit object, even if the merge could be performed with a fast-forward.
$ git checkout develop
Switched to branch 'develop'
$ git merge --no-ff myfeature
Updating ea1b82a..05e9557
(Summary of changes)
$ git branch -d myfeature
Deleted branch myfeature (was 05e9557).
$ git push origin develop