简体繁体 English

是否有git index（临时区域）可视化工具

[英]is there a git index (staging area) visualisation tool

原文 2011-08-27 12:29:15 7 2 git

I'm mainly on Windows, though can use the git bash when required. 我主要在Windows上运行，尽管可以在需要时使用git bash。 I tend to visualise what's going on using git gui and gitk to see inter-relationships. 我倾向于使用git gui和gitk来观察相互之间的关系。

What I'm really looking for is a three way hierarchical visual comparison between my working directory, my staging area (index), and a (eg my_last) commit. 我真正要寻找的是工作目录，暂存区（索引）和（例如my_last）提交之间的三层分层可视化比较。

The comparison would most likely keep the three views synchronised and show how they differ: added / deleted / modified. 比较将最有可能使三个视图保持同步并显示它们之间的差异：添加/删除/修改。 Is there such a tool? 有这样的工具吗？

edit: kdiff3 (see top of page 3) might be the tool, but how to set it up, where would it get Index from? 编辑：kdiff3 （请参阅第3页的顶部）可能是该工具，但是如何设置它，它将从何处获取索引？

2 个解决方案

Take a look at git difftool to help you integrate with kdiff3 and other GUIs. 查看git difftool以帮助您与kdiff3和其他GUI集成。 You can use it 3-way for resolving merge conflicts using git mergetool , but I'm not sure a 3-way simultaneous comparison is useable in other contexts, because there isn't a common baseline that was diverged from. 您可以使用git mergetool 3种方式解决合并冲突，但是我不确定3种方式的同时比较是否可以在其他情况下使用，因为没有通用的基准线。 Use git difftool to see what has changed between your index and working tree, and git difftool --cached to see the difference between what is staged and what is committed. 使用git difftool查看索引和工作树之间的变化，并使用git difftool --cached查看已暂存的内容与提交的内容之间的差异。

There is a quite good git GUI tool for Windows: TortoiseGit Windows有一个非常好的git GUI工具： TortoiseGit

It includes "Tortoise merge" which is a diff tool. 它包括一个比较工具“草龟合并”。 I assume you can see the changes between files/branches/commits/... there. 我假设您可以在那里看到文件/分支/提交/ ...之间的更改。