如何获得真正的patch-set之间的差异，而不是patch-set之间的差异(与rebase相关)

Question

我想我们只看到差异。

是否有一种方法来显示补丁集之间的真正差异?

假设我有一个基本文件test.txt:

This is first line
This is second line
This is third line
This is forth line

我上传一个补丁a:

This is first line
This is second line
This is third line
This is forth line // patch A change

然后上传一个补丁B并合并:

This is first line // patch B change
This is second line
This is third line
This is forth line

现在我们回到补丁A并执行rebase，补丁集编号变为2。所以代码是

This is first line // patch B change
This is second line
This is third line
This is forth line // patch A change

但是当我尝试查看补丁集1和补丁集2之间的差异

显示没有差别!!

Answer 1

PS1和PS2在第一次更改中的唯一区别是提交消息，由于rebase，它将更新父节点和提交日期。

这是因为PS1和PS2之间没有代码更改，除非您必须在rebase期间解决冲突。

如果您想查看当前目标分支的差值，您可以选择PS2和Base之间的差值。