merge commit

A commit with two (or more) parents, recording the point where two lines of history were joined.

In more detail

Its tree is the combined result of both sides, and walking back from it reaches the commits of both branches, which is why history is a graph rather than a list. The commits that were merged are untouched and keep their IDs.

Example

git cat-file -p HEAD

Related terms

Taught in

References

Certification courses