Glossary: Command Line and Git
A commit that joins two branches that have both moved on. It has two parents.
mergefast-forward