Both are correct. The commit history is a Merkle DAG. The tree under each commit is a Merkle tree.