When writing manuscripts in git, my favourite "trick" is git diff --word-diff (of course aliased to git wdiff).