Gotta be jujutsu. I've completely stopped using git and use jj everywhere instead. It works so much better for my workflow.