A merge commit is created by a non-fast-forward merge. It has two parents, so git log --graph shows the branch and join as a diamond.
merge commit
a commit with two parents that records the joining of two histories.
A merge commit is created by a non-fast-forward merge. It has two parents, so git log --graph shows the branch and join as a diamond.