I haven’t used it in years, but magit is really great.

Nowadays I just do a few rounds of git add -p; commit, or trusty ole git commit -av