You can just do `git diff --word-diff` and then the diffs look great even with one paragraph per line.

I used to do one sentence per line, but after getting used to how Emacs handles soft-wrapping, I now do one paragraph per line—also when I use Vim. This also makes collaboration with other authors easier, since most non-vim collaborators do that.