Jujutsu is essentially an alternative front-end or “porcelain” to git, both magnificiently simplified and powerful.
I tried it after using Emacs Magit for about six or seven years, and jujutsu is really easier to use than git and useful if one wants a tidy public history of changes (with “tidy” and “public” as Linus Torvalds recommends). Plus it is fully compatible to git as backend - other contributors will not even note you are using it.
It is simply not my experience that cleaning up commits after committing early is difficult in git. Amending a commit is a single
-a
flag away from thegit commit
command. The opposite problem is when you do too much work and want to split it into multiple commit rather than a huge one, in which casegit add -p
is again a single flag away fromgit add
.In general, git’s entire model is to allow you to work first, and do administrative tasks (including tidying up your commit history etc) later.
And almost nothing is truly destructive in git, the vast majority of cases can be fixed by judicious use of
git reflog
.The only cases I’ve ran into where git repos became corrupted were caused by external tools, mainly GUIs that label buttons with git commands that do something different when clicked (like the button labeled
push
actually doinggit push —all
for no good reason, and such things) with users that have no idea how git works that have been trained just by telling them “click this to save your work, click this to get the last version of the code”I have to admit that in spite of having used git for about 20 years, I never used reflog. And even with magit I did stuff like rebase rarely. I found it costing too much time to read the man pages again every time and meditate what would happen with “reset xyz”.
Fair, git’s documentation can definitely be too terse despite being very extensive and could really benefit from examples and common use cases sections. I only use a fraction of what git offers, but what I do use I use often, which definitely contributes to my happiness with git: I seldomly need to look things up
Now, jujutsu covers almost the same with < 10% of that complexity and less than 10% of the documentation - simpler but the same power.