`git reset --soft HEAD~1; <format>; git comm...
# core
s
git reset --soft HEAD~1; <format>; git commit -a -C ORIG_HEAD
is what I do