blocks|key|323961|text|简短和贴心：|type|unstyled|depth|inlineStyleRanges|entityRanges|data|323962|git+config+--global+diff.tool+meld|code-block|syntax|javascript|323963|这将Git配置为使用meld作为比较工具。(您不需要指定命令行参数，对meld的支持是内置在Git中的。)|offset|length|style|CODE|323964|然后，如果您想要图形化的diff而不是文本的diff，那么只需调用git+difftool而不是git+diff+(它们都接受相同的参数)。在您的案例中：|323965|git+difftool+master..devel|323966|323967|更新:如果您不想要一次一个文件的差异，而是希望使用meld的“子目录”视图以及两个分支之间的所有更改，请注意git+difftool的-d或--dir-diff选项。例如，当我在分支XYZ上，我想看看这个分支和分支ABC之间有什么不同，我运行以下命令：|323968|git+difftool+-d+ABC|323969|entityMap^0|0|0|A|4|Z|4|0|X|C|1C|8|0|0|0|1I|C|1V|2|1Y|A|0|0^^$0|@$1|2|3|4|5|6|7|X|8|@]|9|@]|A|$]]|$1|B|3|C|5|D|7|Y|8|@]|9|@]|A|$E|F]]|$1|G|3|H|5|6|7|Z|8|@$I|10|J|11|K|L]|$I|12|J|13|K|L]]|9|@]|A|$]]|$1|M|3|N|5|6|7|14|8|@$I|15|J|16|K|L]|$I|17|J|18|K|L]]|9|@]|A|$]]|$1|O|3|P|5|D|7|19|8|@]|9|@]|A|$E|F]]|$1|Q|3|-4|5|6|7|1A|8|@]|9|@]|A|$]]|$1|R|3|S|5|6|7|1B|8|@$I|1C|J|1D|K|L]|$I|1E|J|1F|K|L]|$I|1G|J|1H|K|L]]|9|@]|A|$]]|$1|T|3|U|5|D|7|1I|8|@]|9|@]|A|$E|F]]|$1|V|3|-4|5|6|7|1J|8|@]|9|@]|A|$]]]|W|$]]

Short &amp; sweet:

<pre><code>git config --global diff.tool meld
</code></pre>

This configures Git to use <code>meld</code> as the diff tool. (You don't need to specify the command line arguments, support for <code>meld</code> is built into Git.)

Then, if you want a graphical diff instead of a textual one, you simply invoke <code>git difftool</code> instead of <code>git diff</code> (they both take the same arguments). In your case:

<pre><code>git difftool master..devel
</code></pre>

<hr>

Update: If you don't want the one-file-at-a-time diff, but instead want to use meld's "subdirectory" view with all the changes between the two branches, note the <code>-d</code> or <code>--dir-diff</code> option for <code>git difftool</code>. For example, when I'm on branch XYZ and I want to see what is different between this and branch ABC, I run this:

<pre><code>git difftool -d ABC
</code></pre>

blocks|key|3284483|text|尽管从其他答案来看，目前似乎没有办法直接在git存储库中做到这一点，但它很容易(感谢对another+question：)的回答)编写一个脚本，将两个提交的树提取到临时目录并在它们上运行meld，在meld退出时删除这两个目录：|type|unstyled|depth|inlineStyleRanges|entityRanges|offset|length|data|3284484|http://gist.github.com/498628|3284485|当然，您会丢失通过meld所做的任何更改，但我认为这对于快速了解差异是非常好的。|3284486|entityMap|0|LINK|mutability|MUTABLE|url|https://stackoverflow.com/questions/3364575/whats-the-best-way-to-extract-a-tree-from-a-git-repository|1^0|17|G|0|0|0|T|1|0|0^^$0|@$1|2|3|4|5|6|7|Q|8|@]|9|@$A|R|B|S|1|T]]|C|$]]|$1|D|3|E|5|6|7|U|8|@]|9|@$A|V|B|W|1|X]]|C|$]]|$1|F|3|G|5|6|7|Y|8|@]|9|@]|C|$]]|$1|H|3|-4|5|6|7|Z|8|@]|9|@]|C|$]]]|I|$J|$5|K|L|M|C|$N|O]]|P|$5|K|L|M|C|$N|E]]]]

Although it seems from the other answers as if there's not a way to do this directly in the git repository at the moment, it's easy (thanks to the answer to <a href="https://stackoverflow.com/questions/3364575/whats-the-best-way-to-extract-a-tree-from-a-git-repository">another question</a> :)) to write a script that will extract the trees of two commits to temporary directories and run meld on them, removing both directories when meld exits:

<a href="http://gist.github.com/498628" rel="nofollow noreferrer">http://gist.github.com/498628</a>

Of course, you'll lose any changes made via meld, but it's quite nice for a quick overview of the differences, I think.

blocks|key|3071197|text|我还发现这个问题很烦人，所以我制作了git+meld，它允许以一种更舒适的方式来区分工作树或临时区域中的任意提交。你可以在https://github.com/wmanley/git-meld上找到它。它有点像Mark的脚本，但用于将任意提交、临时区域或工作目录与其他任何内容进行比较。如果您比较的对象之一是工作树，那么它也是可读写的，这样您就不会丢失您的更改。|type|unstyled|depth|inlineStyleRanges|entityRanges|offset|length|data|3071198|entityMap|0|LINK|mutability|MUTABLE|url|https://github.com/wmanley/git-meld^0|1P|Z|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 also found this issue annoying so I've made git meld which allows a more comfortable way of diffing arbitrary commits against the working tree or the staging area. You can find it at <a href="https://github.com/wmanley/git-meld" rel="noreferrer">https://github.com/wmanley/git-meld</a> . It's a bit like Mark's script but works for comparing any arbitrary commit or the staging area or the working directory against any of the others. If one of the things you are comparing against is the working tree then that is read-write also so you don't lose your changes.

blocks|key|319444|text|我认为一种简单的方法是使用git+reset+--soft|type|unstyled|depth|inlineStyleRanges|offset|length|style|CODE|entityRanges|data|319445|目标:使用meld比较branch_a和branch_b之间的差异|319446|git+checkout+branch_a
git+checkout+-b+do_diff
git+reset+--soft+branch_b
meld+.|code-block|syntax|javascript|319447|entityMap^0|D|G|0|0|0^^$0|@$1|2|3|4|5|6|7|O|8|@$9|P|A|Q|B|C]]|D|@]|E|$]]|$1|F|3|G|5|6|7|R|8|@]|D|@]|E|$]]|$1|H|3|I|5|J|7|S|8|@]|D|@]|E|$K|L]]|$1|M|3|-4|5|6|7|T|8|@]|D|@]|E|$]]]|N|$]]

I think a easy way for doing this is using <code>git reset --soft</code>:

Goal: compare differences between branch_a and branch_b with meld

<pre><code>git checkout branch_a
git checkout -b do_diff
git reset --soft branch_b
meld .
</code></pre>

blocks|key|324042|text|从GITV1.7.11开始，您可以使用git+difftool+--dir-diff执行目录比较。它与没有https://github.com/wmanley/git-meld脚本的meld一起工作得很好。|type|unstyled|depth|inlineStyleRanges|offset|length|style|CODE|entityRanges|data|324043|配置git|324044|git+config+--global+diff.tool+meld|code-block|syntax|javascript|324045|使用它|324046|git+difftool+-d+topic+++++++++++++//+-d+is+--dir-diff
git+difftool+-d+master..topic|324047|对于macOS|324048|brew+cask+install+meld
git+config+--global+difftool.meld.cmd+'open+-W+-a+Meld+--args+\"$LOCAL\"+\"$PWD/$REMOTE\"'
git+config+--global+difftool.meld.trustExitCode+true|324049|entityMap|0|LINK|mutability|MUTABLE|url|https://github.com/wmanley/git-meld^0|J|N|1H|Z|0|0|0|0|0|0|0|0^^$0|@$1|2|3|4|5|6|7|12|8|@$9|13|A|14|B|C]]|D|@$9|15|A|16|1|17]]|E|$]]|$1|F|3|G|5|6|7|18|8|@]|D|@]|E|$]]|$1|H|3|I|5|J|7|19|8|@]|D|@]|E|$K|L]]|$1|M|3|N|5|6|7|1A|8|@]|D|@]|E|$]]|$1|O|3|P|5|J|7|1B|8|@]|D|@]|E|$K|L]]|$1|Q|3|R|5|6|7|1C|8|@]|D|@]|E|$]]|$1|S|3|T|5|J|7|1D|8|@]|D|@]|E|$K|L]]|$1|U|3|-4|5|6|7|1E|8|@]|D|@]|E|$]]]|V|$W|$5|X|Y|Z|E|$10|11]]]]

Starting with git v1.7.11, you can use <code>git difftool --dir-diff</code> to perform a directory diff. Which works quite well with meld wihout <a href="https://github.com/wmanley/git-meld" rel="noreferrer">https://github.com/wmanley/git-meld</a> scripts.

Configure git

<pre><code>git config --global diff.tool meld
</code></pre>

Use it

<pre><code>git difftool -d topic // -d is --dir-diff
git difftool -d master..topic
</code></pre>

For macOS

<pre><code>brew cask install meld
git config --global difftool.meld.cmd 'open -W -a Meld --args \"$LOCAL\" \"$PWD/$REMOTE\"'
git config --global difftool.meld.trustExitCode true
</code></pre>

blocks|key|322086|text|在git+V1.7.9中，您可以在没有命令行的情况下比较两个提交：|type|unstyled|depth|inlineStyleRanges|entityRanges|data|322087|您必须在'git+gui‘编辑选项中配置全局：“使用合并工具:+meld”。|322088|启动gitk，选择一个提交，右键单击另一个提交>+"diff+this+-->+selected“。在'patch‘下右击一个文件>+"external+diff“。|offset|length|style|BOLD|322089|meld将启动并在右侧显示仍处于选中状态的第一个提交。|322090|entityMap^0|0|0|2|4|Q|M|1W|D|0|0|4|0^^$0|@$1|2|3|4|5|6|7|N|8|@]|9|@]|A|$]]|$1|B|3|C|5|6|7|O|8|@]|9|@]|A|$]]|$1|D|3|E|5|6|7|P|8|@$F|Q|G|R|H|I]|$F|S|G|T|H|I]|$F|U|G|V|H|I]]|9|@]|A|$]]|$1|J|3|K|5|6|7|W|8|@$F|X|G|Y|H|I]]|9|@]|A|$]]|$1|L|3|-4|5|6|7|Z|8|@]|9|@]|A|$]]]|M|$]]

In git V1.7.9 you can compare two commits without the commandline:

You must configure in 'git gui' edit options, global: "Use merge tool: meld".

Start gitk, select a commit, right click another commit > "diff this --> selected".
Under 'patch' right click a file > "external diff".

meld will start and display the still selected, first commit on the right side.

blocks|key|322092|text|重要的是要说的是，使用git+difftool+-d，你的仍然可以编辑，你的工作文件在Meld和保存它们。为了实现这一点，您需要将一些分支与您当前的工作树进行比较，例如：|type|unstyled|depth|inlineStyleRanges|offset|length|style|CODE|BOLD|entityRanges|data|322093|git+difftool+-d+branchname|code-block|syntax|javascript|322094|Meld将显示左目录和右目录都位于/tmp中。但是，正确目录中的文件实际上是指向当前工作目录中文件的符号链接(不适用于Windows)。因此，您可以在Meld中编辑它们，当您保存它们时，您的更改将保存在您的工作目录中。|322095|更有趣的选择是比较当前的工作目录和stash。您可以通过简单地输入：|322096|git+difftool+-d+stash|322097|然后，您可以将一些更改从stash+(左窗口)转移到当前的工作副本(右窗口)，而无需使用git+stash+pop/apply并避免此命令可能导致的麻烦的冲突解决。|322098|我认为它可以显着提高工作流程与隐藏。您可以逐步将更改从stash转移到工作副本，并逐个提交，如果需要，还可以引入其他更改。|322099|entityMap^0|B|F|T|1K|0|0|0|31|0|0|Y|0|0|0|2A|18|J|0|0|1P|0^^$0|@$1|2|3|4|5|6|7|X|8|@$9|Y|A|Z|B|C]|$9|10|A|11|B|D]]|E|@]|F|$]]|$1|G|3|H|5|I|7|12|8|@]|E|@]|F|$J|K]]|$1|L|3|M|5|6|7|13|8|@$9|14|A|15|B|D]]|E|@]|F|$]]|$1|N|3|O|5|6|7|16|8|@$9|17|A|18|B|D]]|E|@]|F|$]]|$1|P|3|Q|5|I|7|19|8|@]|E|@]|F|$J|K]]|$1|R|3|S|5|6|7|1A|8|@$9|1B|A|1C|B|D]|$9|1D|A|1E|B|C]]|E|@]|F|$]]|$1|T|3|U|5|6|7|1F|8|@$9|1G|A|1H|B|D]]|E|@]|F|$]]|$1|V|3|-4|5|6|7|1I|8|@]|E|@]|F|$]]]|W|$]]

It is important to say that using <code>git difftool -d</code> you can still edit your working files in Meld and save them. In order to achieve that you need to compare some branch to your current working tree, for example:

<pre><code>git difftool -d branchname
</code></pre>

Meld will be showing that both left and right directories are located in /tmp. However, files in the right directory are actually symbolic links to your files in the current working directory (does not apply to Windows). So you can edit them right in Meld and when you save them your changes will be saved in your working dir.

Yet more interesting option is comparison of current working dir with stash. You can do that by simply typing:

<pre><code>git difftool -d stash
</code></pre>

Then you can transfer some changes from stash (left window) to your current working copy (right window), without using <code>git stash pop/apply</code> and avoiding bothersome conflict resolution which may be induced by this commands.

I think that it can significantly boost up workflow with stashes. You can gradually transfer changes from stash to working copy and commit them one by one, introducing some another changes if you want.

blocks|key|3284776|text|对于macOS上的Meld，请按照the+maintainer+of+the+macOS+application,+yousseb的建议将其添加到您的~/.gitconfig|type|unstyled|depth|inlineStyleRanges|offset|length|style|CODE|entityRanges|data|3284777|[diff]
++tool+=+meld
[difftool]
++prompt+=+false
[difftool+"meld"]
++trustExitCode+=+true
++cmd+=+open+-W+-a+Meld+--args+\"$LOCAL\"+\"$REMOTE\"
[merge]
++tool+=+meld
[mergetool]
++prompt+=+false
[mergetool+"meld"]
++trustExitCode+=+true
++cmd+=+open+-W+-a+Meld+--args+--auto-merge+\"$LOCAL\"+\"$BASE\"+\"$REMOTE\"+--output=\"$MERGED\"|code-block|syntax|javascript|3284778|如果愿意，您可以省略merge配置。|3284779|由于自动转义和/或zsh的某些原因，@GutenYe's+answer对我不起作用。|3284780|entityMap|0|LINK|mutability|MUTABLE|url|https://yousseb.github.io/meld/|1|https://stackoverflow.com/a/12815806/764945^0|23|C|H|1C|0|0|0|A|5|0|9|3|I|H|1|0^^$0|@$1|2|3|4|5|6|7|Y|8|@$9|Z|A|10|B|C]]|D|@$9|11|A|12|1|13]]|E|$]]|$1|F|3|G|5|H|7|14|8|@]|D|@]|E|$I|J]]|$1|K|3|L|5|6|7|15|8|@$9|16|A|17|B|C]]|D|@]|E|$]]|$1|M|3|N|5|6|7|18|8|@$9|19|A|1A|B|C]]|D|@$9|1B|A|1C|1|1D]]|E|$]]|$1|O|3|-4|5|6|7|1E|8|@]|D|@]|E|$]]]|P|$Q|$5|R|S|T|E|$U|V]]|W|$5|R|S|T|E|$U|X]]]]

For Meld on macOS, add this to your <code>~/.gitconfig</code> as recommended by <a href="https://yousseb.github.io/meld/" rel="nofollow noreferrer">the maintainer of the macOS application, yousseb</a>:

<pre><code>[diff]
 tool = meld
[difftool]
 prompt = false
[difftool "meld"]
 trustExitCode = true
 cmd = open -W -a Meld --args \"$LOCAL\" \"$REMOTE\"
[merge]
 tool = meld
[mergetool]
 prompt = false
[mergetool "meld"]
 trustExitCode = true
 cmd = open -W -a Meld --args --auto-merge \"$LOCAL\" \"$BASE\" \"$REMOTE\" --output=\"$MERGED\"
</code></pre>

You can omit the <code>merge</code> configs if you would like.

<a href="https://stackoverflow.com/a/12815806/764945">@GutenYe's answer</a> didn't work out for me due to automatic escaping and/or something with <code>zsh</code>.

I know that I can view the difference between HEAD and current state with <code>meld .</code>. But how can I view the differences between branches, for example <code>master</code> and <code>devel</code> with meld?

At the moment I do the following steps:

<ol>
<li>Rename folder of working copy 
 For example <code>mv /projectA /projectA_master</code>)</li>

<li>Clone the project again 
 <code>git clone url</code></li>

<li>Switch to <code>devel</code> branch 
 <code>cd projectA && git -b devel origin/devel</code> </li>

<li>View differences with meld 
 <code>meld /projectA_Master projectA</code></li>
</ol> 

Isn't there an easier way to get the same result in meld? I only need it to review the changes and not primarily for merging.

View differences of branches with meld?

Windows

我知道我可以用meld .查看头部和当前状态之间的差异。但是如何查看分支之间的差异，例如使用meld查看master和devel之间的差异？目前，我执行以下步骤：重命名工作副本的文件夹例如，再次mv /projectA /projectA_master)Clone该项目git clone urlSwitch到devel...

问使用meld查看分支的差异？
EN

社区

活动

资源

关于

腾讯云开发者

热门产品

热门推荐

更多推荐

问使用meld查看分支的差异？EN

社区

活动

资源

关于

腾讯云开发者

热门产品

热门推荐

更多推荐

问使用meld查看分支的差异？
EN