[sodapopcan]

Tig looks great but fugitive is in my fingers (been using it for something like 7 or 8 years at this point). I'll still check it out.

Not sure when the last time you used fugitive but there was a major overhaul a couple of years ago. You can expand diffs in the commit window and stage parts of the files.

But obviously, stick with what you're comfortable with!