Do you know about `git commit -p`? You might like it even more than `git add -p`.