gitk默认显示合并的差异吗？ [英] Can gitk show the diff of merges by default?

问题描述

当前没有冲突的合并 gitk 显示没有差异。是否有可能通过defautl显示由合并（实际上在那里，例如 git diff HEAD〜1 合并显示这些差异）后产生的差异。使用命令行开关？或者为什么默认情况下gitk不显示它们？

解决方案

默认 gitk 与 - cc 选项一样，对 git diff 执行同样的操作，并压缩合并以仅显示差异块不要直接来自一位或其他家长。这通常更有帮助，因为冲突是合并的有趣部分，diff的其他部分已经出现在组成分支的提交的差异中。

查看合并父项和合并提交项之间完全区别的最简单方法是选择父项（正常单击），并从合并提交的上下文菜单（右侧/备用单击菜单）中选择Diff选中 - >这个。

Currently for merges without conflicts gitk shows no diffs. Is it possible to have the diffs resulting from a merge (which are indeed there, e.g. git diff HEAD~1 after the merge shows these diffs) shown by defautl, e.g. using a command line switch? Or why does gitk by default not show them?

解决方案

By default gitk does the same thing as the --cc option to git diff and compresses the merge to only show diff chunks that don't come directly from one or other parent. This is usually more helpful as conflicts are the interesting part of merges, the other parts of the diff will already appear in the diffs for the commits that made up the branch which was merged in.

The easiest way to view the full diff between a parent of a merge and the merge commit is to select the parent (normal click) and from the context menu on the merge commit (right/alternate click menu) select "Diff selected -> this".

这篇关于gitk默认显示合并的差异吗？的文章就介绍到这了，希望我们推荐的答案对大家有所帮助，也希望大家多多支持IT屋！