What if when you git merge a branch into master, it collapses all the branch commits into a single commit that appears on the master branch, but the branch commits can still be viewed as being contained within the merge commit?
Meaning you could expand a the merge, see the branches that were merged into the branch, and the individual commits made on that branch.