git-apply: war on whitespace -- finishing touches.