Better git diff - at the word level - in the terminal
This way, git will not just show you which lines were deleted or added, it will also try to determine which lines were 'changed' making things much more esier to figure out.
git diff --word-diff