Glossary: Git Beyond the Basics

--no-ff

Also written: merge --no-ff

A `git merge` option that always makes a merge commit, even when a fast-forward was possible, so the branch stays visible in history.