merge commit

Also written: merge commits

A commit with two parents that joins two branches' histories. `git merge --no-ff` always makes one, and a rebase avoids them.