Tweaking Git to behave properly for diffs