I've gotten in the habit of adding trailing whitespace when I comment out code or do any printf debugging. It's still quick, but then git yells at me if I try and commit it.
That's okay though. I visually review the diff before I commit (almost) every time.