> git add -p, although its main problem is that you can only select chunks, not separate lines.

Typing "e" will let you edit the chunk. Then you can get as fine grained as you like.

Personally, I use Emacs and commit-patch [1].

[1] http://porkrind.org/commit-patch