[davvid]

[shameless plug] http://git-cola.github.com/ can do by-line and by-hunk editing of both the index and work tree. It's had this feature since early 2008 ;-)

I find it easier to do it with a GUI vs. with `git add -p`.