All the whitespace-only changes should be done in a separate commit -- or better yet for Git, in another branch.