Have you checked out Pijul?

[felix91gr]

trafficstars

It's a (wip, so far) implementation of this paper's findings: Pijul.

You might want to know about it @spderosso, because it has actual correctness guarantees unlike Git and its model better matches human intuition. They could use your design insights into git's ergonomics, though. If Pijul's gonna replace Git someday (and it might), it needs all the design help it can get from the start :)