blocks|key|779187|text|我想你只需要'git+show+-c+$ref‘就可以了。在a8e4a59上的git存储库上尝试此方法会显示一个组合的差异(在2列中的一个列中加/减字符)。正如git-show手册中提到的，它很大程度上委托给'git+diff-tree‘，所以这些选项看起来很有用。|type|unstyled|depth|inlineStyleRanges|entityRanges|data|779188|entityMap^0|0^^$0|@$1|2|3|4|5|6|7|D|8|@]|9|@]|A|$]]|$1|B|3|-4|5|6|7|E|8|@]|9|@]|A|$]]]|C|$]]

I think you just need 'git show -c $ref'. Trying this on the git repository on a8e4a59 shows a combined diff (plus/minus chars in one of 2 columns). As the git-show manual mentions, it pretty much delegates to 'git diff-tree' so those options look useful.

blocks|key|993682|text|查看提交消息：|type|unstyled|depth|inlineStyleRanges|entityRanges|data|993683|commit+0e1329e551a5700614a2a34d8101e92fd9f2cad6+(HEAD,+master)
Merge:+fc17405+ee2de56
Author:+Tilman+Vogel+<email@email>
Date:+++Tue+Feb+22+00:27:17+2011+%2B0100

Merge+branch+'testing'+into+master|code-block|syntax|javascript|993684|请注意这一行：|993685|Merge:+fc17405+ee2de56|993686|获取这两个提交ids并反转它们。所以为了得到你想要的差异，你应该这样做：|993687|git+diff+ee2de56...fc17405|993688|要仅显示已更改文件的名称，请执行以下操作：|993689|git+diff+--name-only+ee2de56..fc17405|993690|要解压缩它们，可以将以下内容添加到gitconfig中：|993691|exportfiles+=+!sh+-c+'git+diff+$0+--name-only+%7C+"while+read+files;+do+mkdir+-p+\"$1/$(dirname+$files)\";+cp+-vf+$files+$1/$(dirname+$files);+done"'|993692|然后通过执行以下操作来使用它：|993693|git+exportfiles+ee2de56..fc17405+/c/temp/myproject|993694|entityMap^0|0|0|0|0|0|0|0|0|0|0|0|0^^$0|@$1|2|3|4|5|6|7|12|8|@]|9|@]|A|$]]|$1|B|3|C|5|D|7|13|8|@]|9|@]|A|$E|F]]|$1|G|3|H|5|6|7|14|8|@]|9|@]|A|$]]|$1|I|3|J|5|D|7|15|8|@]|9|@]|A|$E|F]]|$1|K|3|L|5|6|7|16|8|@]|9|@]|A|$]]|$1|M|3|N|5|D|7|17|8|@]|9|@]|A|$E|F]]|$1|O|3|P|5|6|7|18|8|@]|9|@]|A|$]]|$1|Q|3|R|5|D|7|19|8|@]|9|@]|A|$E|F]]|$1|S|3|T|5|6|7|1A|8|@]|9|@]|A|$]]|$1|U|3|V|5|D|7|1B|8|@]|9|@]|A|$E|F]]|$1|W|3|X|5|6|7|1C|8|@]|9|@]|A|$]]|$1|Y|3|Z|5|D|7|1D|8|@]|9|@]|A|$E|F]]|$1|10|3|-4|5|6|7|1E|8|@]|9|@]|A|$]]]|11|$]]

Look at the commit message:
<pre><code>commit 0e1329e551a5700614a2a34d8101e92fd9f2cad6 (HEAD, master)
Merge: fc17405 ee2de56
Author: Tilman Vogel &lt;email@email&gt;
Date: Tue Feb 22 00:27:17 2011 +0100

Merge branch 'testing' into master
</code></pre>
notice the line:
<pre><code>Merge: fc17405 ee2de56
</code></pre>
take those two commit ids and reverse them. so in order get the diff that you want, you would do:
<pre><code>git diff ee2de56...fc17405
</code></pre>
to show just the names of the changed files:
<pre><code>git diff --name-only ee2de56..fc17405
</code></pre>
and to extract them, you can add this to your gitconfig:
<pre><code>exportfiles = !sh -c 'git diff $0 --name-only | &quot;while read files; do mkdir -p \&quot;$1/$(dirname $files)\&quot;; cp -vf $files $1/$(dirname $files); done&quot;'
</code></pre>
then use it by doing:
<pre><code>git exportfiles ee2de56..fc17405 /c/temp/myproject
</code></pre>

blocks|key|779314|text|在合并之前，您可以创建HEAD设置为one+commit的分支。然后，您可以执行以下操作：|type|unstyled|depth|inlineStyleRanges|entityRanges|data|779315|git+merge+--squash+testing|code-block|syntax|javascript|779316|这将合并，但不会提交。然后：|779317|git+diff|779318|entityMap^0|0|0|0|0^^$0|@$1|2|3|4|5|6|7|M|8|@]|9|@]|A|$]]|$1|B|3|C|5|D|7|N|8|@]|9|@]|A|$E|F]]|$1|G|3|H|5|6|7|O|8|@]|9|@]|A|$]]|$1|I|3|J|5|D|7|P|8|@]|9|@]|A|$E|F]]|$1|K|3|-4|5|6|7|Q|8|@]|9|@]|A|$]]]|L|$]]

You can create branch with HEAD set to one commit before merge. Then, you can do:

<pre><code>git merge --squash testing
</code></pre>

This will merge, but not commit. Then:

<pre><code>git diff
</code></pre>

blocks|key|779377|text|在您的情况下，您只需要|type|unstyled|depth|inlineStyleRanges|entityRanges|data|779378|git+diff+HEAD%5E+HEAD%5E2|code-block|syntax|javascript|779379|或者只是为了你的提交而散列：|779380|git+diff+0e1329e55%5E+0e1329e55%5E2|779381|entityMap^0|0|0|0|0^^$0|@$1|2|3|4|5|6|7|M|8|@]|9|@]|A|$]]|$1|B|3|C|5|D|7|N|8|@]|9|@]|A|$E|F]]|$1|G|3|H|5|6|7|O|8|@]|9|@]|A|$]]|$1|I|3|J|5|D|7|P|8|@]|9|@]|A|$E|F]]|$1|K|3|-4|5|6|7|Q|8|@]|9|@]|A|$]]]|L|$]]

in your case you just need to

<pre><code>git diff HEAD^ HEAD^2
</code></pre>

or just hash for you commit:

<pre><code>git diff 0e1329e55^ 0e1329e55^2
</code></pre>

blocks|key|993846|text|如果您的合并提交是commit+0e1329e5，如上所述，您可以通过以下方式获取此合并中包含的diff：|type|unstyled|depth|inlineStyleRanges|entityRanges|data|993847|git+diff+0e1329e5%5E..0e1329e5|code-block|syntax|javascript|993848|我希望这能帮到你!|993849|entityMap^0|0|0|0^^$0|@$1|2|3|4|5|6|7|K|8|@]|9|@]|A|$]]|$1|B|3|C|5|D|7|L|8|@]|9|@]|A|$E|F]]|$1|G|3|H|5|6|7|M|8|@]|9|@]|A|$]]|$1|I|3|-4|5|6|7|N|8|@]|9|@]|A|$]]]|J|$]]

If your merge commit is commit 0e1329e5, as above, you can get the diff that was contained in this merge by:

<pre><code>git diff 0e1329e5^..0e1329e5
</code></pre>

I hope this helps!

blocks|key|779494|text|如果您坐在合并提交位置，则会显示差异：|type|unstyled|depth|inlineStyleRanges|entityRanges|data|779495|git+diff+HEAD~1..HEAD|offset|length|style|CODE|779496|如果您不在合并提交，那么只需将HEAD替换为合并提交。这种方法似乎是最简单、最直观的。|779497|entityMap^0|0|0|L|0|0^^$0|@$1|2|3|4|5|6|7|L|8|@]|9|@]|A|$]]|$1|B|3|C|5|6|7|M|8|@$D|N|E|O|F|G]]|9|@]|A|$]]|$1|H|3|I|5|6|7|P|8|@]|9|@]|A|$]]|$1|J|3|-4|5|6|7|Q|8|@]|9|@]|A|$]]]|K|$]]

If you are sitting at the merge commit then this shows the diffs:

<code>git diff HEAD~1..HEAD</code>

If you're not at the merge commit then just replace HEAD with the merge commit. This method seems like the simplest and most intuitive.

After doing a "simple" merge (one without conflicts), <code>git show</code> usually only shows something like

<pre><code>commit 0e1329e551a5700614a2a34d8101e92fd9f2cad6 (HEAD, master)
Merge: fc17405 ee2de56
Author: Tilman Vogel &lt;email@email&gt;
Date: Tue Feb 22 00:27:17 2011 +0100

Merge branch 'testing' into master
</code></pre>

This is because, for merges, <code>git show</code> uses the combined diff format which omits files that agree with either of the parent versions.

Is there a way to force git to still show all differences in combined diff mode? 

Doing <code>git show -m</code> will show the differences (using pairwise diffs between the new and all parent versions respectively) but I would prefer to have that with the differnces marked by +/- in the respective columns like in combined mode.

How to "git show" a merge commit with combined diff output even when every changed file agrees with one of the parents?

在执行“简单的”合并(没有冲突的合并)之后，git show通常只显示如下内容commit 0e1329e551a5700614a2a34d8101e92fd9f2cad6 (HEAD, master)Merge: fc17405 ee2de56Author: Tilman Vogel <email@email>Dat...

问如何"git显示“合并提交和组合的差异输出，即使每个更改的文件都与父文件之一一致？
EN

社区

活动

资源

关于

腾讯云开发者

热门产品

热门推荐

更多推荐

问如何"git显示“合并提交和组合的差异输出，即使每个更改的文件都与父文件之一一致？EN

社区

活动

资源

关于

腾讯云开发者

热门产品

热门推荐

更多推荐

问如何"git显示“合并提交和组合的差异输出，即使每个更改的文件都与父文件之一一致？
EN