Jujutsu

Jujutsu (jj) is a version control system that works with Git repositories and adds an operation log with undo and first-class conflicts. It is for developers who use Git and want a different workflow on the same repos.