Reposted 1060.

martinvonz/jj: A Git-compatible VCS that is both simple and powerful

github.com/martinvonz/jj

While not as rigorous as systems like Darcs and Pijul (which are based on a formalized theory of patches