Comment by mjlee

git add -i is the thing you'd have to learn.

I do that at the CLI most of the time and I'd say I'm quite experienced with it, but I still prefer IntelliJ when it gets complicated.