Comment by djur

I find `git add -p` useful for that kind of work.