git-gui: Include 'war on whitespace' fixes from git.git