Tip: If you accidentally forgot to use --amend and now have 2 commits, you can merge them with git rebase -i; see Git For LibreOffice Developers for instructions.
--amend
git rebase -i