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.
In more detail
It happens when the merge base is the tip of your own branch. No commit is written and no history changes shape, only a label moves. git pull does this when you have no local commits, and a push is only accepted when it fast-forwards the remote branch, unless you force it.
Related 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.
- merge base — The newest commit that two branches both contain, the point where their histories split.
- --no-ff — A git merge flag that always creates a merge commit, even when a fast-forward would have been possible.
- 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
- Fetch Is Not Pull — Advanced Git Internals & Distributed Workflows