Right. Whitespace is annoying (I usually have gedit-trailsave enabled to delete trailing whitespace on saves but that messes up the commits, but then I guess there's other problems with -w; is there an ignore trailing whitespace flag?).