Look at whitespace removal settings for your editor, perhaps it supports that feature?  For example, I use Sublime Text 2 and have the `trim_trailing_white_space_on_save` setting enabled, which will remove any extraneous whitespaces upon save.  Also, run a `git diff` prior to committing code changes and review it to see if any whitespace modifications snuck in there.  If so, add the whitespace back in until that line's diff disappears.