[nurb]

Not to forget git gui, that allow you to pick lines to commit instead of the whole file

[c0l0]

So does

    git add --patch [FILE...]

btw (by invoking your $EDITOR).