Have git not colorize output for diffs

We need more control over diff colorization for proper rendering
and processing. Ensure that local settings don't cause us to
blow up when we're doing it.

Change-Id: I07fc445d9328c9df1ed52e8b328cce6fbea78f43
Merge "Have git not colorize output for diffs"