Jujutsu: a new, Git-compatible version control system

>when you have already-committed changes that you decide to split up further, git is not helpful

Works for me, and complexity is reasonable enough to not warrant wrappers like stgit.

$ git log --oneline
777777 sample
666666 sample
555555 sample
$ git rebase -i 666666^ # and insert 'x bash' before 666666 or $ git rebase -i 666666^^ # and mark 555555 as 'edit'
$ git checkout -p 666666 # select hunks you want
$ vi blah.c; make; git add (-p); # fixup some more if needed
$ git commit -c 666666 # commit first part of 666666 -> 66666a
$ git rebase --continue # commit second part of 666666 -> 66666b, 777777, etc.