To avoid editing the commit message you can use:

  -C <commit>, --reuse-message=<commit>
    Take an existing commit object, and reuse the log message and the authorship information (including the timestamp) when creating the commit.

In the above example, commit can simply be "HEAD", when doing the amend commit:

  git commit -C HEAD --amend