On an related note - another nice diff flag I discovered recently is "git diff --word-diff" - which will as the name suggests, diff by word instead of line.