Your vim is configured to remove trailing space on saving, right? But this adds noise to the diff. Use `git add -p` to see exactly what goes into a commit and avoid situations like this next time.