blocks|key|2589349|text|从GITV1.7.11开始，您可以使用git+difftool+--dir-diff执行目录比较。|type|unstyled|depth|inlineStyleRanges|offset|length|style|CODE|entityRanges|data|2589350|下面的答案适用于早于v1.7.11的git安装。|2589351|2589352|正如其他人所提到的，git+difftool可以用来在图形用户界面中打开你的diff。但是，如果您有多个经过更改的文件，它将为每个文件打开一个单独的GUI实例。|2589353|我写了一个脚本来解决这个“特性”，并允许在一个GUI实例中打开所有的文件。您可以找到git+diffall+script+on+GitHub。|2589354|另外，你可能会对这个相关的SO问题感兴趣：|2589355|git+difftool,+open+all+diff+files+immediately,+not+in+serial|2589356|entityMap|0|LINK|mutability|MUTABLE|url|https://github.com/thenigan/git-diffall|1|2|https://stackoverflow.com/questions/1220309/git-difftool-open-all-diff-files-immediately-not-in-serial/2746292#2746292^0|J|N|J|N|0|0|0|0|A|C|0|16|B|16|S|1|0|0|0|1O|2|0^^$0|@$1|2|3|4|5|6|7|11|8|@$9|12|A|13|B|C]]|D|@$9|14|A|15|1|16]]|E|$]]|$1|F|3|G|5|6|7|17|8|@]|D|@]|E|$]]|$1|H|3|-4|5|6|7|18|8|@]|D|@]|E|$]]|$1|I|3|J|5|6|7|19|8|@$9|1A|A|1B|B|C]]|D|@]|E|$]]|$1|K|3|L|5|6|7|1C|8|@$9|1D|A|1E|B|C]]|D|@$9|1F|A|1G|1|1H]]|E|$]]|$1|M|3|N|5|6|7|1I|8|@]|D|@]|E|$]]|$1|O|3|P|5|6|7|1J|8|@]|D|@$9|1K|A|1L|1|1M]]|E|$]]|$1|Q|3|-4|5|6|7|1N|8|@]|D|@]|E|$]]]|R|$S|$5|T|U|V|E|$W|X]]|Y|$5|T|U|V|E|$W|X]]|Z|$5|T|U|V|E|$W|10]]]]

Starting with git v1.7.11, you can use <a href="https://github.com/thenigan/git-diffall" rel="nofollow noreferrer"><code>git difftool --dir-diff</code></a> to perform a directory diff.

The answer that follows applies to git installations older than v1.7.11.

<hr>

As mentioned by others, <code>git difftool</code> may be used to open your diff in a GUI. However if you have multiple files with changes, it will open a separate instance of the GUI for each file.

I wrote a script to work around this "feature" and allow all the files to be opened in a single GUI instance. You can find the <a href="https://github.com/thenigan/git-diffall" rel="nofollow noreferrer"><code>git diffall</code> script on GitHub</a>.

Also, you may be interested in this related SO question:

<a href="https://stackoverflow.com/questions/1220309/git-difftool-open-all-diff-files-immediately-not-in-serial/2746292#2746292">git difftool, open all diff files immediately, not in serial</a>

blocks|key|2590021|text|如果你想要一个友好的用户界面，但仍然想留在你的终端中，你可以使用：|type|unstyled|depth|inlineStyleRanges|entityRanges|data|2590022|git+tui+diff+[args...]|code-block|syntax|javascript|2590023|​|2590024|📷|atomic|offset|length|2590025|2590026|安装|2590027|2590028|2590029|2590030|sudo+snap+install+git-tui|2590031|https://github.com/ArthurSonzogni/git-tui|2590032|免责声明：我是作者。|style|BOLD|2590033|它是一个在麻省理工学院许可下的开放的source项目。|2590034|entityMap|0|IMAGE|mutability|IMMUTABLE|imageUrl|https://ask.qcloudimg.com/http-save/yehe-900000/fd6e9f2deb231421307b0cb8c90a400a.gif|imageAlt|1|https://ask.qcloudimg.com/http-save/yehe-900000/d50d6d084e8c8a5bf9bddfa078851579.svg|2|LINK|MUTABLE|url|3^0|0|0|0|0|1|0|0|0|0|0|0|1|1|0|0|0|0|15|2|0|0|4|0|I|6|3|0^^$0|@$1|2|3|4|5|6|7|1J|8|@]|9|@]|A|$]]|$1|B|3|C|5|D|7|1K|8|@]|9|@]|A|$E|F]]|$1|G|3|H|5|6|7|1L|8|@]|9|@]|A|$]]|$1|I|3|J|5|K|7|1M|8|@]|9|@$L|1N|M|1O|1|1P]]|A|$]]|$1|N|3|H|5|6|7|1Q|8|@]|9|@]|A|$]]|$1|O|3|P|5|6|7|1R|8|@]|9|@]|A|$]]|$1|Q|3|H|5|6|7|1S|8|@]|9|@]|A|$]]|$1|R|3|J|5|K|7|1T|8|@]|9|@$L|1U|M|1V|1|1W]]|A|$]]|$1|S|3|H|5|6|7|1X|8|@]|9|@]|A|$]]|$1|T|3|U|5|D|7|1Y|8|@]|9|@]|A|$E|F]]|$1|V|3|W|5|6|7|1Z|8|@]|9|@$L|20|M|21|1|22]]|A|$]]|$1|X|3|Y|5|6|7|23|8|@$L|24|M|25|Z|10]]|9|@]|A|$]]|$1|11|3|12|5|6|7|26|8|@]|9|@$L|27|M|28|1|29]]|A|$]]|$1|13|3|-4|5|6|7|2A|8|@]|9|@]|A|$]]]|14|$15|$5|16|17|18|A|$19|1A|1B|-4]]|1C|$5|16|17|18|A|$19|1D|1B|-4]]|1E|$5|1F|17|1G|A|$1H|W]]|1I|$5|1F|17|1G|A|$1H|W]]]]

If you want a human friendly UI, but still want to stay within your terminal, you can use:
<pre class="lang-sh prettyprint-override"><code>git tui diff [args...]
</code></pre>
<img src="https://github.com/ArthurSonzogni/git-tui/raw/master/demo.gif" alt="!demo" />
<h3>Install</h3>
<a href="https://snapcraft.io/git-tui" rel="noreferrer"><img src="https://snapcraft.io/git-tui/badge.svg" alt="git-tui" /></a>
<pre class="lang-sh prettyprint-override"><code>sudo snap install git-tui
</code></pre>
<a href="https://github.com/ArthurSonzogni/git-tui" rel="noreferrer">https://github.com/ArthurSonzogni/git-tui</a>
Disclaimer: I am the author.
It is an open <a href="https://github.com/ArthurSonzogni/git-tui" rel="noreferrer">source</a> project under the MIT license.

blocks|key|1909976|text|Beyond+Compare做得很好-不需要对创建.diff文件的基本'git+diff‘命令进行配置更改。Beyond+Compare在文件树视图中显示.diff文件中引用的所有文件，并在选择文件时显示每个文件的差异。|type|unstyled|depth|inlineStyleRanges|entityRanges|offset|length|data|1909977|在Beyond+Compare中，使用'Tools+->+View+Patch‘菜单选项|1909978|entityMap|0|LINK|mutability|MUTABLE|url|https://www.scootersoftware.com/^0|0|E|0|0|0^^$0|@$1|2|3|4|5|6|7|N|8|@]|9|@$A|O|B|P|1|Q]]|C|$]]|$1|D|3|E|5|6|7|R|8|@]|9|@]|C|$]]|$1|F|3|-4|5|6|7|S|8|@]|9|@]|C|$]]]|G|$H|$5|I|J|K|C|$L|M]]]]

<a href="https://www.scootersoftware.com/" rel="noreferrer">Beyond Compare</a> does this nicely - no configuration changes needed to the basic 'git diff' command which creates the .diff file. Beyond Compare shows all the files, that are referenced in the .diff file in a file tree view and the diff for each file as you select it.

In Beyond Compare, use the 'Tools -> View Patch' menu option

blocks|key|2589885|text|IntelliJ、GoLand、PyCharm等JetBrains产品都内置了diff工具。如果你想在当前提交和之前提交之间有一个不同，你只需要右击代码行的左边并打开Annotation，然后点击任何注释，你就会看到所有文件的不同。|type|unstyled|depth|inlineStyleRanges|entityRanges|data|2589886|此外，如果你想查看当前分支与另一个分支的差异，比如origin/master，你也可以这样做。您只需右键单击根目录并悬停在Git菜单上，然后单击Compare+with+Branch并选择master，就可以一起查看所有的差异，就像在Github上查看拉取请求一样。|2589887|entityMap^0|0|0^^$0|@$1|2|3|4|5|6|7|F|8|@]|9|@]|A|$]]|$1|B|3|C|5|6|7|G|8|@]|9|@]|A|$]]|$1|D|3|-4|5|6|7|H|8|@]|9|@]|A|$]]]|E|$]]

JetBrains products like IntelliJ, GoLand, PyCharm etc all have the diff tool built-in. If you want to have a diff between current commit vs previous commit you just right click on the left of code line and turn on Annotation, then click any annotation you will view the all the files diff. 

Furthermore, if you want to view the diff of current branch vs another branch like origin/master you can do that too. You just right click on the root directory and hover over to Git menu and you click Compare with Branch and select master you view all the diffs together just like viewing a Pull Request on Github.

blocks|key|4703870|text|我知道您正在寻找的是图形用户界面而不是TUI，但是vi/vim/vimdiff将显示一个带有语法突出显示的diff文件：view+changes.diff，其中的changes.diff是通过执行git+--no-pager+diff+>+changes.diff创建的。我一直在寻找一个可以读取这些文件的图形用户界面，但没有用-+meld有一个--comparison-file=COMPARISON_FILE选项，但无论比较文件格式是什么，它都不能与常规(统一的)+diff输出一起工作。|type|unstyled|depth|inlineStyleRanges|offset|length|style|CODE|entityRanges|data|4703871|entityMap^0|1O|H|29|C|2Q|Y|4M|4|4T|X|0^^$0|@$1|2|3|4|5|6|7|H|8|@$9|I|A|J|B|C]|$9|K|A|L|B|C]|$9|M|A|N|B|C]|$9|O|A|P|B|C]|$9|Q|A|R|B|C]]|D|@]|E|$]]|$1|F|3|-4|5|6|7|S|8|@]|D|@]|E|$]]]|G|$]]

I know you're looking for a GUI rather than a TUI, but vi/vim/vimdiff will display a diff file with syntax highlighting: <code>view changes.diff</code>, where <code>changes.diff</code> was created by doing <code>git --no-pager diff &gt; changes.diff</code>. I've been looking all over the place for a GUI that will read one of these files, to no avail - <code>meld</code> has a <code>--comparison-file=COMPARISON_FILE</code> option, but whatever that comparison file format is, it doesn't work with regular (unified) diff output.

blocks|key|2590036|text|这是用来做这件事的a+site+-+Diffy+-一个分享差异的工具。|type|unstyled|depth|inlineStyleRanges|entityRanges|offset|length|data|2590037|你可以粘贴你的diff文本输出，或者上传一个包含diff输出的文件，然后它会自动在树浏览器上显示diff。这对于你没有任何权限在你的机器上安装程序的场景是很好的(谢谢，雇主！)|2590038|entityMap|0|LINK|mutability|MUTABLE|url|https://diffy.org/^0|9|6|0|0|0^^$0|@$1|2|3|4|5|6|7|N|8|@]|9|@$A|O|B|P|1|Q]]|C|$]]|$1|D|3|E|5|6|7|R|8|@]|9|@]|C|$]]|$1|F|3|-4|5|6|7|S|8|@]|9|@]|C|$]]]|G|$H|$5|I|J|K|C|$L|M]]]]

Here is <a href="https://diffy.org/" rel="nofollow noreferrer">a site</a> to do this - Diffy - A tool for sharing diffs.
There you can paste your diff text output, or upload a file containing the diff output, then it automatically shows the diff on a tree explorer. It's good for scenarios where you don't have any permissions to install programs on your machine (thanks, employer!).

blocks|key|5703|text|git+diff有一个--ext-diff选项，可以将diff输出通过管道传输到外部diff程序。与Git一起工作的流行的开源比较程序包括kdiff3和Meld。|type|unstyled|depth|inlineStyleRanges|offset|length|style|CODE|entityRanges|data|5704|entityMap|0|LINK|mutability|MUTABLE|url|http://git-scm.com/docs/git-diff|1|http://kdiff3.sourceforge.net/|2|http://meld.sourceforge.net/^0|0|8|B|A|0|8|0|1X|6|1|24|4|2|0^^$0|@$1|2|3|4|5|6|7|R|8|@$9|S|A|T|B|C]|$9|U|A|V|B|C]]|D|@$9|W|A|X|1|Y]|$9|Z|A|10|1|11]|$9|12|A|13|1|14]]|E|$]]|$1|F|3|-4|5|6|7|15|8|@]|D|@]|E|$]]]|G|$H|$5|I|J|K|E|$L|M]]|N|$5|I|J|K|E|$L|O]]|P|$5|I|J|K|E|$L|Q]]]]

<a href="http://git-scm.com/docs/git-diff" rel="nofollow"><code>git diff</code></a> has a <code>--ext-diff</code> option that pipes the diff output to an external diff program. Popular open source diff programs that are known to work with Git include <a href="http://kdiff3.sourceforge.net/" rel="nofollow">kdiff3</a> and <a href="http://meld.sourceforge.net/" rel="nofollow">Meld</a>.

blocks|key|1909899|text|git+difftool将运行所有流行的工具，如meld，tkdiff等。对于合并，你也可以运行git+mergetool。|type|unstyled|depth|inlineStyleRanges|entityRanges|data|1909900|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|$]]

git difftool will run all popular ones like meld, tkdiff, etc. Also for merges you can run git mergetool.

blocks|key|1915739|text|我不确定我是否正确理解了您的问题，但显然在SmartGit+(2.0,+currently+available+in+alpha)的下一个版本中，您可以使用日志窗口来区分任意提交-尽管我还没有尝试过。|type|unstyled|depth|inlineStyleRanges|entityRanges|offset|length|data|1915740|entityMap|0|LINK|mutability|MUTABLE|url|http://www.syntevo.com/smartgit/early-access.html^0|V|X|0|0^^$0|@$1|2|3|4|5|6|7|L|8|@]|9|@$A|M|B|N|1|O]]|C|$]]|$1|D|3|-4|5|6|7|P|8|@]|9|@]|C|$]]]|E|$F|$5|G|H|I|C|$J|K]]]]

I'm not sure I've understood your question correctly, but apparently in the next version of SmartGit (<a href="http://www.syntevo.com/smartgit/early-access.html" rel="nofollow">2.0, currently available in alpha</a>), you can use the log window to do diffs between arbitrary commits - I haven't tried yet though.

Is there program that allows output of a git-diff command to be explored in a GUI?

What i am looking for is something similar to the how SmartGit displays its view of the differences between the working copy and the HEAD. Where each of the files that are different to the HEAD are displayed and the diff for the focused file is displayed.

I am not sure if it is possible to make SmartGit display the output of a "git diff" command.

<img src="https://i.stack.imgur.com/M4JwT.png" alt="alt text">

Explore git-diff output in a GUI?

翻译质量差，导致语言生硬或混乱。

没有提供实际的解决方法或示例。

解答不清晰，无法理解或解决问题。

页面排版不美观，阅读体验差。

文章

问答

视频

教程

学习中心

腾讯云实验室

直播

竞赛

腾讯云代码分析专区

腾讯iOA零信任安全管理系统专区

腾讯云架构师技术同盟交流圈

腾讯云数据库专区

腾讯云智能顾问专区

腾讯云原生专区

腾讯混元专区

腾讯云TCE专区

腾讯云Lighthouse专区

腾讯云HAI专区

腾讯云Edgeone专区

腾讯云存储专区

腾讯云智能专区

腾讯轻联专区 

腾讯云开发专区

TAPD专区

腾讯轻量云游戏服专区

腾讯云最具价值专家

腾讯云架构师技术同盟

腾讯云创作之星

腾讯云开发者先锋

腾讯云AI代码助手

云原生构建

TAPD 敏捷项目管理

Cloud Studio

SDK中心

API中心

命令行工具

功能1上新10个字符

功能2描述100个字符功能2描述100个字符功能2描述100个字符功能2描述100个字符功能2描述100个字符功能2描述100个字符功能2描述100个字符功能2描述100个字符功能2描述100个字符。

功能2上新100个字符功能2上新100个字符功能2上新100个字符功能2上新100个字符功能2上新100个字符功能2上新100个字符功能2上新100个字符功能2上新100个字符功能2上新100个字符。

功能5描述100个字符功能5描述100个字符功能5描述100个字符功能5描述100个字符功能5描述100个字符功能5描述100个字符

功能5上新100个字符功能5上新100个字符功能5上新100个字符功能5上新100个字符功能5上新100个字符功能5上新100个字符功能5上新100个字符功能5上新100个字符功能5上新100个字符功能5上新100个字符

功能4上新

文章&问答评论现已支持表情

全新交互，全新视觉，新增快捷键、悬浮工具栏、高亮块等功能并同时优化现有功能，全面提升创作效率和体验

社区富文本编辑器全新改版！诚邀体验～ 

精选全网热门MCP server，让你的AI更好用 🚀

💥开发者 MCP广场重磅上线！

涵盖代码开发、场景应用、自动测试全流程，助你从零构建专属AI助手

一站式MCP教程库，解锁AI应用新玩法

聚焦“写作效率、视觉美观与运行性能”三方面进行全面升级，为您提供更高效、稳定的创作环境

社区富文本&Markdown编辑器全新改版上线，欢迎大家体验!

诚挚邀请您参与本次调研，分享您的真实使用感受与建议。您的反馈至关重要，感谢您的支持与参与！

社区新版编辑器体验调研

是否有程序允许在GUI中浏览git-diff命令的输出？我正在寻找的是类似于SmartGit如何显示工作副本和头部之间差异的视图。其中显示与头部不同的每个文件，并且显示聚焦文件的diff。我不确定是否可以让SmartGit显示"git diff“命令的输出。​​

问在GUI中探索git-diff输出？
EN

回答 9

Stack Overflow用户

Stack Overflow用户

Stack Overflow用户

社区

活动

圈层

关于

腾讯云开发者

热门产品

热门推荐

更多推荐

问在GUI中探索git-diff输出？EN

回答 9

Stack Overflow用户

Stack Overflow用户

Stack Overflow用户

社区

活动

圈层

关于

腾讯云开发者

热门产品

热门推荐

更多推荐

问在GUI中探索git-diff输出？
EN