git rebase 是否允许您压缩到不同的非父提交上？

Question

目前，git rebase -i 显示

pick aa89fe9 getdicts: url fixes, and quotes in shell scripting.
pick b3d1e34 fixed silly-long title, and block-code quoting (4-spaces)
pick 8cfb562 oops

我想压缩 8cfb562 onto/and aa89fe9 并保持 b3d1e34 不变。 git rebase 允许我这样做吗？如果不允许，最有效的方法是什么？

Answer 1

I want to squash 8cfb562 onto aa89fe9 and leave b3d1e34 as-is. Does git rebase allow me to do this ...

是：只需按照文档的指示将说明重新排列成所需的顺序

# These lines can be re-ordered; they are executed from top to bottom.

看起来像这样

pick aa89fe9 getdicts: url fixes, and quotes in shell scripting.
pick 8cfb562 oops
pick b3d1e34 fixed silly-long title, and block-code quoting (4-spaces)

然后将第二个pick替换为squash或s。

请注意，如果 "moved" 提交之一依赖于过去较早、现在实际上较晚的操作之一，您可能必须解决某种冲突。

git rebase 是否允许您压缩到不同的非父提交上？

Does git rebase allow you to squash onto a different non-parent commit?

git

git-rebase