Comment by baq
2 days ago
After two decades of using git I'm either telling LLMs to do rebases for me or use jj (or both). Life's too short.
2 days ago
After two decades of using git I'm either telling LLMs to do rebases for me or use jj (or both). Life's too short.
Just make sure you've committed and/or stashed first, as you don't really want to rely on the stochastic process to retain your local-only critical work product.
That's one of the nice features of jj: instead of having an index, the working tree is its own commit, and it tracks the history of that when you run most jj commands.
This works because each commit gets a "change id" assigned that only changes when you say. When you create a new commit, edit its commit message, and edit files, you end up with three git commits with the same change id, but two of the git commits will be gc'ed eventually. (The change id is what you normally use to identify what's in the git commit graph.)
So even if you issue a command that destroys overwrite some important changes, jj has a good chance of remembering your worktree state.