have you heard of/are you using `git add --patch` for staging your edits? If not it can be really handy for catching whitespace goofiness slash giving everything one last QC before committing. At least with my setup (which I think may be the default?) it highlights extra whitespace in bright evil red. Here's a [little post](http://johnkary.net/blog/git-add-p-the-most-powerful-git-feature-youre-not-using-yet/) about it if you're interested.