News for hackers. Stuff that matters.
Re:Jujutsu for Everyone by baq on Sunday August 31, 2025 @02:10PM (#45085447)
The edited commit, assuming it doesn’t have conflicts with predecessors, builds just fine. Successor commits with conflicts that you just introduced predictably don’t - but you aren’t editing them, so it isn’t a problem. In fact, that’s exactly why this feature is so compelling.
Re:Jujutsu for Everyone by adastra22 on Sunday August 31, 2025 @07:31PM (#45088030)
Sorry if I’m being dense, but I still don’t get how this is any different. If I interactive rebase and stop to edit a commit, isn’t that the same thing?
Re:Jujutsu for Everyone by steveklabnik on Sunday August 31, 2025 @11:21PM (#45089153)
You have to finish the rebase before git will let you move in to other work. jj will not. With git you can stop in the middle to make changes, but you must continue until the rebase is done.
Re:Jujutsu for Everyone by adastra22 on Monday September 01, 2025 @02:12AM (#45089925)
Ok. There are simple workarounds. I git rebase —quit and then make a branch for this saved rebase progress to return to later. I then restart the rebase from the corresponding commit. It would be much nicer if this was all wrapped up a simple command.

There is value here, but I think it is more like “add a new command consisting of 50-100 lines of code” not “write an entirely new VCS.”

Re:Jujutsu for Everyone by steveklabnik on Monday September 01, 2025 @03:14AM (#45090285)
One little thing here, one little thing there, it all adds up. The jj model is more orthogonal, and so ends up being easier, which also translates to more power.