JJ is is a new version control system, made to be compatible with git and _much_ less painful than it.