--no-ff

A git merge flag that always creates a merge commit, even when a fast-forward would have been possible.

In more detail

Teams use it to keep a visible record that a group of commits arrived together from one branch. Adding --log also lists the merged commits' subjects in the merge message.

Example

git merge --no-ff --log retry-window

Related terms

Taught in

References