--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-windowRelated terms
- merge — Combining the work of two branches into one, either by moving a branch forward (a fast-forward) or by recording a merge commit.
- fast-forward — A merge where the current branch has nothing new, so Git simply moves it forward to the other branch's commit without creating a merge commit.
- merge commit — A commit with two (or more) parents, recording the point where two lines of history were joined.
Taught in
- Committing, And What A Good Message Says — Advanced Git Internals & Distributed Workflows
- Merging: Fast Forward Or A Merge Commit — Advanced Git Internals & Distributed Workflows