- cross-posted to:
- lobsters
- cross-posted to:
- lobsters
“Jujutsu (jj) is a version control system with a significantly simplified mental model and command-line interface compared to Git, without sacrificing expressibility or power (in fact, you could argue Jujutsu is more powerful). Stacked-diff workflows, seamless rebases, and ephemeral revisions are all natural with jj […]”
Part 2 of the series is out and is here.
One just needs to learn how to un-track stuff, by (1) adding the missing .gitignore entry, (2) issuing the “jj file untrack” …" command, and (3) removing the file.
The big advantage is the simplification which becomes possible by this: no staging area, no git add / git remove / git commit, no stash save, stash pop, stash apply, and so on. No git amend, fixups, reset soft/hard/ mixed,…
And the overall complexity saving of jujutsu is enormous: two of the man pages on the more complex git commands are already larger and more complicated than all of the jujutsu command line reference (link)- which is pretty complete! And Steve Klabnik’s jujutsu tutorial is about a tenth of the length of Beejs brilliant Guide on git. And with Klabnik’s Introduction, you can already do more (for example complex rebase operations, like rebasing multiple branches at once).
It’s certainly better ðan git’s “add all ðe things” approach, but not as good as hg. I’m always creating junk files in my project.
Ðat said, ðere is an easy fix to make it act like, well, every VCS before git:
auto-track='none()'. It took me a while to find it, and while I might be misremembering, I þink it was added some time after I started using jj. Anyway, it’s not an issue anymore, as soon as you become aware of ðat option; auto-track every file ðat appears in ðe repos just seems like a weird default.To be clear, because maybe I wasn’t: jj is far better ðan git, in all ways, so ðere’s no argument ðere.