blocks|key|862198|text|Git提供了一系列预先配置好的“开箱即用”的差异工具(kdiff3、kompare、tkdiff、meld、xxdiff、emerge、vimdiff、gvimdiff、ecmerge、diffuse、opendiff、p4merge和araxis)，还允许您指定自己的内容。要使用一个预配置的差异工具(例如，"vimdiff")，需要将以下代码行添加到~/.gitconfig中|type|unstyled|depth|inlineStyleRanges|offset|length|style|CODE|entityRanges|data|862199|[diff]
++++tool+=+vimdiff|code-block|syntax|javascript|862200|现在，您将能够运行"git+difftool“并使用您选择的工具。|862201|另一方面，指定您自己的difftool需要更多的工作，请参见How+do+I+view+'git+diff'+output+with+my+preferred+diff+tool/+viewer?|862202|entityMap|0|LINK|mutability|MUTABLE|url|https://stackoverflow.com/questions/255202/how-do-i-view-git-diff-output-with-visual-diff-program^0|4X|C|0|0|0|U|1W|0|0^^$0|@$1|2|3|4|5|6|7|W|8|@$9|X|A|Y|B|C]]|D|@]|E|$]]|$1|F|3|G|5|H|7|Z|8|@]|D|@]|E|$I|J]]|$1|K|3|L|5|6|7|10|8|@]|D|@]|E|$]]|$1|M|3|N|5|6|7|11|8|@]|D|@$9|12|A|13|1|14]]|E|$]]|$1|O|3|-4|5|6|7|15|8|@]|D|@]|E|$]]]|P|$Q|$5|R|S|T|E|$U|V]]]]

Git offers a range of difftools pre-configured "out-of-the-box" (kdiff3, kompare, tkdiff, meld, xxdiff, emerge, vimdiff, gvimdiff, ecmerge, diffuse, opendiff, p4merge and araxis), and also allows you to specify your own. To use one of the pre-configured difftools (for example, "vimdiff"), you add the following lines to your <code>~/.gitconfig</code>:

<pre><code>[diff]
 tool = vimdiff
</code></pre>

Now, you will be able to run "git difftool" and use your tool of choice.

Specifying your own difftool, on the other hand, takes a little bit more work, see <a href="https://stackoverflow.com/questions/255202/how-do-i-view-git-diff-output-with-visual-diff-program">How do I view &#39;git diff&#39; output with my preferred diff tool/ viewer?</a>

blocks|key|645022|text|下面是我的~/.gitconfig中配置diff和merge工具的部分。我喜欢SourceGear的diffmerge。(事实上，我非常非常喜欢它)。|type|unstyled|depth|inlineStyleRanges|entityRanges|data|645023|[merge]
++++++++tool+=+diffmerge
[mergetool+"diffmerge"]
++++++++cmd+=+"diffmerge+--merge+--result=\"$MERGED\"+\"$LOCAL\"+\"$(if+test+-f+\"$BASE\";+then+echo+\"$BASE\";+else+echo+\"$LOCAL\";+fi)\"+\"$REMOTE\""
++++++++trustExitCode+=+false
[diff]
++++++++tool+=+diffmerge
[difftool+"diffmerge"]
++++++++cmd+=+diffmerge+\"$LOCAL\"+\"$REMOTE\"|code-block|syntax|javascript|645024|因此，您将在[difftool+"diffmerge"]行中定义一个名为"diffmerge“的工具。然后，我在[diff]++tool+=部分中将工具"diffmerge“设置为默认值。|offset|length|style|CODE|645025|很明显，我的路径中有"diffmerge“命令，这里。否则，我需要给出可执行文件的完整路径。|645026|entityMap^0|0|0|6|M|1K|E|0|0^^$0|@$1|2|3|4|5|6|7|Q|8|@]|9|@]|A|$]]|$1|B|3|C|5|D|7|R|8|@]|9|@]|A|$E|F]]|$1|G|3|H|5|6|7|S|8|@$I|T|J|U|K|L]|$I|V|J|W|K|L]]|9|@]|A|$]]|$1|M|3|N|5|6|7|X|8|@]|9|@]|A|$]]|$1|O|3|-4|5|6|7|Y|8|@]|9|@]|A|$]]]|P|$]]

Here's the part of my ~/.gitconfig where I configure diff and merge tools. I like diffmerge by SourceGear. (I like it very very much, as a matter of fact).

<pre><code>[merge]
 tool = diffmerge
[mergetool "diffmerge"]
 cmd = "diffmerge --merge --result=\"$MERGED\" \"$LOCAL\" \"$(if test -f \"$BASE\"; then echo \"$BASE\"; else echo \"$LOCAL\"; fi)\" \"$REMOTE\""
 trustExitCode = false
[diff]
 tool = diffmerge
[difftool "diffmerge"]
 cmd = diffmerge \"$LOCAL\" \"$REMOTE\"
</code></pre>

So, you see, you're defining a tool named "diffmerge" in the <code>[difftool "diffmerge"]</code> line. Then I'm setting the tool "diffmerge" as the default in the <code>[diff] tool =</code> section.

I obviously have the "diffmerge" command in my path, here. Otherwise I'd need to give a full path to the executable.

blocks|key|645059|text|执行此操作的另一种方法(从命令行)：|type|unstyled|depth|inlineStyleRanges|entityRanges|data|645060|git+config+--global+diff.tool+tkdiff
git+config+--global+merge.tool+tkdiff
git+config+--global+--add+difftool.prompt+false|code-block|syntax|javascript|645061|前两行将difftool和mergetool设置为tkdiff-根据您的偏好进行更改。第三行禁用了恼人的提示符，因此每当您点击git+difftool时，它都会自动启动difftool。|offset|length|style|CODE|645062|entityMap^0|0|0|P|6|1R|C|0^^$0|@$1|2|3|4|5|6|7|O|8|@]|9|@]|A|$]]|$1|B|3|C|5|D|7|P|8|@]|9|@]|A|$E|F]]|$1|G|3|H|5|6|7|Q|8|@$I|R|J|S|K|L]|$I|T|J|U|K|L]]|9|@]|A|$]]|$1|M|3|-4|5|6|7|V|8|@]|9|@]|A|$]]]|N|$]]

An additional way to do that (from the command line):

<pre><code>git config --global diff.tool tkdiff
git config --global merge.tool tkdiff
git config --global --add difftool.prompt false
</code></pre>

The first two lines will set the difftool and mergetool to <code>tkdiff</code>- change that according to your preferences. The third line disables the annoying prompt so whenever you hit <code>git difftool</code> it will automatically launch the difftool.

blocks|key|645107|text|在我的视窗和Linux开发环境中使用KDiff3，添加下面的代码块就可以了。它提供了一个很好的、一致的跨平台比较和合并工具。|type|unstyled|depth|inlineStyleRanges|entityRanges|offset|length|data|645108|Linux|645109|[difftool+"kdiff3"]
++++path+=+/usr/bin/kdiff3
++++trustExitCode+=+false
[difftool]
++++prompt+=+false
[diff]
++++tool+=+kdiff3
[mergetool+"kdiff3"]
++++path+=+/usr/bin/kdiff3
++++trustExitCode+=+false
[mergetool]
++++keepBackup+=+false
[merge]
++++tool+=+kdiff3|code-block|syntax|javascript|645110|视窗|645111|[difftool+"kdiff3"]
++++path+=+C:/Progra~1/KDiff3/kdiff3.exe
++++trustExitCode+=+false
[difftool]
++++prompt+=+false
[diff]
++++tool+=+kdiff3
[mergetool+"kdiff3"]
++++path+=+C:/Progra~1/KDiff3/kdiff3.exe
++++trustExitCode+=+false
[mergetool]
++++keepBackup+=+false
[merge]
++++tool+=+kdiff3|645112|entityMap|0|LINK|mutability|MUTABLE|url|http://kdiff3.sourceforge.net/^0|I|6|0|0|0|0|0|0^^$0|@$1|2|3|4|5|6|7|W|8|@]|9|@$A|X|B|Y|1|Z]]|C|$]]|$1|D|3|E|5|6|7|10|8|@]|9|@]|C|$]]|$1|F|3|G|5|H|7|11|8|@]|9|@]|C|$I|J]]|$1|K|3|L|5|6|7|12|8|@]|9|@]|C|$]]|$1|M|3|N|5|H|7|13|8|@]|9|@]|C|$I|J]]|$1|O|3|-4|5|6|7|14|8|@]|9|@]|C|$]]]|P|$Q|$5|R|S|T|C|$U|V]]]]

Adding one of the blocks below works for me to use <a href="http://kdiff3.sourceforge.net/" rel="noreferrer">KDiff3</a> for my Windows and Linux development environments. It makes for a nice consistent cross-platform diff and merge tool.

<h3>Linux</h3>

<pre><code>[difftool "kdiff3"]
 path = /usr/bin/kdiff3
 trustExitCode = false
[difftool]
 prompt = false
[diff]
 tool = kdiff3
[mergetool "kdiff3"]
 path = /usr/bin/kdiff3
 trustExitCode = false
[mergetool]
 keepBackup = false
[merge]
 tool = kdiff3
</code></pre>

<h3>Windows</h3>

<pre><code>[difftool "kdiff3"]
 path = C:/Progra~1/KDiff3/kdiff3.exe
 trustExitCode = false
[difftool]
 prompt = false
[diff]
 tool = kdiff3
[mergetool "kdiff3"]
 path = C:/Progra~1/KDiff3/kdiff3.exe
 trustExitCode = false
[mergetool]
 keepBackup = false
[merge]
 tool = kdiff3
</code></pre>

blocks|key|862403|text|在Windows中，我们需要运行git+difftool+--tool-help命令来查看各种选项，如：|type|unstyled|depth|inlineStyleRanges|offset|length|style|CODE|entityRanges|data|862404|++++'git+difftool+--tool=<tool>'+may+be+set+to+one+of+the+following:
++++++++++++++++++++vimdiff
++++++++++++++++++++vimdiff2
++++++++++++++++++++vimdiff3

++++The+following+tools+are+valid,+but+not+currently+available:
++++++++++++++++++++araxis
++++++++++++++++++++bc
++++++++++++++++++++bc3
++++++++++++++++++++codecompare
++++++++++++++++++++deltawalker
++++++++++++++++++++diffmerge
++++++++++++++++++++diffuse
++++++++++++++++++++ecmerge
++++++++++++++++++++emerge
++++++++++++++++++++examdiff
++++++++++++++++++++gvimdiff
++++++++++++++++++++gvimdiff2
++++++++++++++++++++gvimdiff3
++++++++++++++++++++kdiff3
++++++++++++++++++++kompare
++++++++++++++++++++meld
++++++++++++++++++++opendiff
++++++++++++++++++++p4merge
++++++++++++++++++++tkdiff
++++++++++++++++++++winmerge
++++++++++++++++++++xxdiff

Some+of+the+tools+listed+above+only+work+in+a+windowed
environment.+If+run+in+a+terminal-only+session,+they+will+fail.|code-block|syntax|javascript|862405|我们可以添加它们中的任何一个(例如，WinMerge)，如下所示|862406|git+difftool+--tool=winmerge|862407|要将Notepad%2B%2B配置为在提交前查看文件：|862408|+git+config+--global+core.editor+"'C:/Program+Files/Notepad%2B%2B/notepad%2B%2B.exe'+-multiInst+-notabbar+-nosession+-noPlugin"|862409|使用git+commit将在Notepad%2B%2B中打开提交信息。|862410|entityMap|0|LINK|mutability|MUTABLE|url|https://en.wikipedia.org/wiki/WinMerge|1|https://en.wikipedia.org/wiki/Notepad%252B%252B^0|G|O|0|0|I|8|0|0|0|2|9|1|0|0|2|A|0^^$0|@$1|2|3|4|5|6|7|14|8|@$9|15|A|16|B|C]]|D|@]|E|$]]|$1|F|3|G|5|H|7|17|8|@]|D|@]|E|$I|J]]|$1|K|3|L|5|6|7|18|8|@]|D|@$9|19|A|1A|1|1B]]|E|$]]|$1|M|3|N|5|H|7|1C|8|@]|D|@]|E|$I|J]]|$1|O|3|P|5|6|7|1D|8|@]|D|@$9|1E|A|1F|1|1G]]|E|$]]|$1|Q|3|R|5|H|7|1H|8|@]|D|@]|E|$I|J]]|$1|S|3|T|5|6|7|1I|8|@$9|1J|A|1K|B|C]]|D|@]|E|$]]|$1|U|3|-4|5|6|7|1L|8|@]|D|@]|E|$]]]|V|$W|$5|X|Y|Z|E|$10|11]]|12|$5|X|Y|Z|E|$10|13]]]]

In Windows we need to run the <code>git difftool --tool-help</code> command to see the various options like:
<pre><code> 'git difftool --tool=&lt;tool&gt;' may be set to one of the following:
 vimdiff
 vimdiff2
 vimdiff3

 The following tools are valid, but not currently available:
 araxis
 bc
 bc3
 codecompare
 deltawalker
 diffmerge
 diffuse
 ecmerge
 emerge
 examdiff
 gvimdiff
 gvimdiff2
 gvimdiff3
 kdiff3
 kompare
 meld
 opendiff
 p4merge
 tkdiff
 winmerge
 xxdiff

Some of the tools listed above only work in a windowed
environment. If run in a terminal-only session, they will fail.
</code></pre>
And we can add any of them (for example, <a href="https://en.wikipedia.org/wiki/WinMerge" rel="nofollow noreferrer">WinMerge</a>) like
<pre><code>git difftool --tool=winmerge
</code></pre>
For configuring <a href="https://en.wikipedia.org/wiki/Notepad%2B%2B" rel="nofollow noreferrer">Notepad++</a> to see files before committing:
<pre><code> git config --global core.editor &quot;'C:/Program Files/Notepad++/notepad++.exe' -multiInst -notabbar -nosession -noPlugin&quot;
</code></pre>
And using <code>git commit</code> will open the commit information in Notepad++.

How do I configure Git to use a different tool for diffing with the .gitconfig file?

I have this in my .gitconfig:

<pre><code>[diff]
 tool = git-chdiff #also tried /bin/git-chdiff
</code></pre>

It does not work; it just opens the regular command line diff. When I do

<pre><code>export GIT_EXTERNAL_DIFF=git-chdiff
</code></pre>

then <code>git diff</code> will open up the external diffing tool (so I know the external diff tool script works fine). Do I have something wrong with my .gitconfig configuration for the diff tool?

Configuring diff tool with .gitconfig

Windows

Linux

如何将Git配置为使用不同的工具来区别.gitconfig文件？我的.gitconfig中有以下内容：[diff]    tool = git-chdiff #also tried /bin/git-chdiff它不起作用；它只是打开常规的命令行diff。当我这样做的时候export GIT_EXTERNAL_DIFF...

问使用.gitconfig配置比较工具
EN

社区

活动

资源

关于

腾讯云开发者

热门产品

热门推荐

更多推荐

问使用.gitconfig配置比较工具EN

社区

活动

资源

关于

腾讯云开发者

热门产品

热门推荐

更多推荐

问使用.gitconfig配置比较工具
EN