Comment by stagalooo

FWIW, my workflow with git is to stage changes I want to keep after every prompt. Then I can discard changes in the working area after a bad prompt or stage individual changes before discarding from the working area. Works really nice for me.