In the future try to avoid things like this. 

I run `git add -p` which asks you diff by diff whether you want to add it to the commit. It's pretty nice.