Jujutsu: a new, Git-compatible version control system

FYI the way I usually work is edit edit edit ... oh, this hunk and that hunk and this other one over here are really part of a different commit: pop up a Magit buffer, select those various hunks into staging, make a commit from them. Edit edit edit, rinse repeat.

After a while you have 10-15 (or more) "partial commits" that you want to turn into 2 or 3 or 4 "real" commits. Pop up a Magit buffer and enter interactive rebase: move the partial commits around into the right order and next to each other and squash the parts together and make a real commit message. If you accidentally have too much stuff in a commit mark it for edit and split it.

Then you're done.