问题 How do I edit or reword a merge commit's message? git commit --amend works if it's the last commit made ( HEAD ), but what if it comes before HEAD ? git rebase -i HEAD~5 doesn't list the merge commits. 回答1: If you add the --preserve-merges option (or its synonym, -p ) to the git rebase -i command then git will try to preserve the merges when rebasing, rather than linearizing the history, and you should be able to amend the merge commits as well: git rebase -i -p HEAD~5 回答2: Note that,