git - 修改 merge 前 Git 提交的消息

Question

在 merge 到远程分支之前，我提交了一些测试代码。这次 merge 有很多冲突，需要很长时间才能纠正。所以我的历史看起来像这样:

7ab562c Merge from remote branch
... whole load of commits brought across from the remote branch...
f3e71c2 Temporary TESTING COMMIT

测试代码没问题，我真的只是想更改提交消息。通常我会直接使用 git rebase -i f3e71c2^(因为这些都还没有被推送)，但一位同事告诉我这会搞砸 merge 。我真的不想搞砸 merge :)

我的同事是否正确？如果是这样，我能做些什么，还是我只需要忍受这段历史？

Answer 1

你可以试试 git rebase --preserve-merges --interactive , 与:

-p
--preserve-merges

Instead of ignoring merges, try to recreate them.

手册页的 BUG 部分包括:

The todo list presented by --preserve-merges --interactive does not represent the topology of the revision graph.
Editing commits and rewording their commit messages should work fine, but attempts to reorder commits tend to produce counterintuitive results.

---

作为jthill的 comment描述(因为如果冲突解决是记录器，-p 将更好地保留 merge ):

You can retroactively light rerere for a merge:

git config rerere.enabled true
git checkout $merge^1

git merge $merge^2
# for Windows: 
# git merge $merge^^2

git read-tree --reset -u $merge
git commit -m-
git checkout @{-1}

如 Soufiane Roui 所述在 the comments :

For Windows CMD users, use double caret to point for parents of the merge commit (e.g $merge^^1 instead of $merge^1).
Because the caret is considered as an escape character.