Better git add -p?

Question

Sometimes I work on system without X Window installed, and can\'t use Git GUI.

What are existing console alternatives to the git add -p?

I like

Answer 1

If I were in the same situation as you (a mix of hunks where some hunks are 'more important' than others), I'd commit the lesser hunks into their own commits with easily distinguishable commit message and leave only those 'more important' hunks so that they don't get in the way of diffs, or git add -i.

With the easily distinguishable commit messages for the "less privileged" hunks it should be easy to deal with them later.