Today's novelty git argument: --patience. Example usage: `git diff --patience` and it can produce friendlier diffs: https://bramcohen.livejournal.com/73318.html