`git add -p` will take you through all the changes in your files, and let you add them selectively. I find this makes for much cleaner commits.