Whitespace is annoying, here's how to deal with it.
$(master) git merge -Xignore-all-space origin/master$(a-cool-feature) git rebase -Xignore-all-space masterAdd ?w=1 to the URL to see the diff with whitespace ignored.
http://vim.wikia.com/wiki/Remove_unwanted_spaces
{
"trim_trailing_white_space_on_save": true
}