Like 'git add -p' but much much better:

http://porkrind.org/missives/commit-patch-managing-your-mess...