I always use `git commit -v` (with alias).

You get the diff in the editor when you write commit message.