Re:Rewrite Git history via drag-and-drop
by stouset on Wednesday December 04, 2024 @06:11AM
(#42316396)
This was the exact thing that kept me from trying it sooner. I wish I’d realized that that doesn’t imply an “everything gets committed” approach.
It’s trivial to split a change in two. So your working copy is constantly snapshotted, and when you’re finished you `jj split` and choose the parts you want to keep. The rest is moved out into a new change.
That workflow is in practice basically identical to the `git add -p` one, though the terminology is a bit different and there are some greatly simplifying changes under the hood.
Maybe I'll check it out. Deferring conflict resolution is definitely a killer feature.