@dave give Jujutsu a look, it’s built on top of git’s data store (so is compatible with anything git) but the support for moving changes between branches is so much nicer to use.
@dave as one example it has a trivial to use jj split command, which provides an interactive editor to select which chunks you want in which commit, then provides you with two clean commits.
@jon "you should move your big projects to it, it won't break anything" being a valid answer.
My understanding is that it's all Git underneath, and you can jettison it at any point and just resume a Git workflow - correct?
@dave yeah, I was similarly hesitant but haven’t had any problems in practice. I think on one occasion I had to drop down to git’s oplog to unstick myself (and that may have been a lack of jj understanding at the time).