I can use
git commit -a
This option seems to be just what you're looking for:
-e, --edit The message taken from file with -F, command line with -m, and from commit object with -C are usually used as the commit log message unmodified. This option lets you further edit the message taken from these sources.