`git add -p` sounds like a useful tool to try.