git log --first-parent shows the merges but not the complete history of each merged branch. git log --first-parent --patch displays all the changes that came with a merge as if it were one big squash commit (in general git log --patch diffs trees, not single commits).