[gcommer]

> git add --patch can help here, but it's still tedious work.

This is pretty much the operative line of the post. Rather than invert my whole development flow, I just use a UI like Magit which makes patch commits trivial.

[kevinmchugh]

I just aliased "add -p" to "git ap" and use lots of "commit --amend" and everything feels easy

[Cthulhu_]

I use it all the time and abbreviated it to 'gap', and "git commit --amend" without a comment to 'gam'.

(and 'git push --force' to 'git yolo', then later to 'gpf', but don't tell anyone)