It helps if you do the renames in a separate commit with no text changes, though that affects the squash-everything workflow.

Git not being smart enough to recognize re-indents is probably the biggest issue I have with it. Though it seems to be a notorious fact on the git mailing list that whatever problem you may have with git, that there's already a patch for it floating around somewhere. I'll have to look around sometime to see how well this theory applies in this case.