blocks|key|546478|text|尝试git+difftool|type|unstyled|depth|inlineStyleRanges|entityRanges|data|546479|使用git+difftool而不是git+diff。你再也回不去了。|offset|length|style|CODE|546480|更新以添加示例用法：|546481|下面是另一个关于git+difftool的堆栈溢出链接：How+do+I+view+'git+diff'+output+with+my+preferred+diff+tool/+viewer?|546482|对于较新版本的git，difftool命令支持许多开箱即用的外部比较工具。例如，vimdiff是自动支持的，可以通过以下方式从命令行打开：|546483|cd+/path/to/git/repo
git+difftool+--tool=vimdiff|code-block|syntax|javascript|546484|通过git+difftool+--tool-help列出了其他受支持的外部diff工具，以下是示例输出：|546485|'git+difftool+--tool=<tool>'+may+be+set+to+one+of+the+following:
++++++++araxis
++++++++kompare
++++++++vimdiff
++++++++vimdiff2

The+following+tools+are+valid,+but+not+currently+available:
++++++++bc3
++++++++codecompare
++++++++deltawalker
++++++++diffuse
++++++++ecmerge
++++++++emerge
++++++++gvimdiff
++++++++gvimdiff2
++++++++kdiff3
++++++++meld
++++++++opendiff
++++++++tkdiff
++++++++xxdiff|546486|entityMap|0|LINK|mutability|MUTABLE|url|https://stackoverflow.com/questions/255202/how-do-i-view-git-diff-output-with-visual-diff-program^0|0|2|C|H|8|0|0|8|C|S|1W|0|0|7|3|B|8|14|7|0|0|2|O|0|0^^$0|@$1|2|3|4|5|6|7|14|8|@]|9|@]|A|$]]|$1|B|3|C|5|6|7|15|8|@$D|16|E|17|F|G]|$D|18|E|19|F|G]]|9|@]|A|$]]|$1|H|3|I|5|6|7|1A|8|@]|9|@]|A|$]]|$1|J|3|K|5|6|7|1B|8|@$D|1C|E|1D|F|G]]|9|@$D|1E|E|1F|1|1G]]|A|$]]|$1|L|3|M|5|6|7|1H|8|@$D|1I|E|1J|F|G]|$D|1K|E|1L|F|G]|$D|1M|E|1N|F|G]]|9|@]|A|$]]|$1|N|3|O|5|P|7|1O|8|@]|9|@]|A|$Q|R]]|$1|S|3|T|5|6|7|1P|8|@$D|1Q|E|1R|F|G]]|9|@]|A|$]]|$1|U|3|V|5|P|7|1S|8|@]|9|@]|A|$Q|R]]|$1|W|3|-4|5|6|7|1T|8|@]|9|@]|A|$]]]|X|$Y|$5|Z|10|11|A|$12|13]]]]

<h1>Try git difftool</h1>
Use <code>git difftool</code> instead of <code>git diff</code>. You'll never go back.
<h3>UPDATE to add an example usage:</h3>
Here is a link to another stackoverflow that talks about <code>git difftool</code>: <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>
For newer versions of <code>git</code>, the <code>difftool</code> command supports many external diff tools out-of-the-box. For example <code>vimdiff</code> is auto supported and can be opened from the command line by:
<pre><code>cd /path/to/git/repo
git difftool --tool=vimdiff
</code></pre>
Other supported external diff tools are listed via <code>git difftool --tool-help</code> here is an example output:
<pre><code>'git difftool --tool=&lt;tool&gt;' may be set to one of the following:
 araxis
 kompare
 vimdiff
 vimdiff2

The following tools are valid, but not currently available:
 bc3
 codecompare
 deltawalker
 diffuse
 ecmerge
 emerge
 gvimdiff
 gvimdiff2
 kdiff3
 meld
 opendiff
 tkdiff
 xxdiff
</code></pre>

blocks|key|546496|text|export+GIT_EXTERNAL_DIFF='meld+$2+$5;+echo+>/dev/null'|type|code-block|depth|inlineStyleRanges|entityRanges|data|syntax|javascript|546497|然后简单地说：|unstyled|546498|git+diff|546499|entityMap^0|0|0|0^^$0|@$1|2|3|4|5|6|7|K|8|@]|9|@]|A|$B|C]]|$1|D|3|E|5|F|7|L|8|@]|9|@]|A|$]]|$1|G|3|H|5|6|7|M|8|@]|9|@]|A|$B|C]]|$1|I|3|-4|5|F|7|N|8|@]|9|@]|A|$]]]|J|$]]

<pre><code>export GIT_EXTERNAL_DIFF='meld $2 $5; echo &gt;/dev/null'
</code></pre>

then simply:

<pre><code>git diff
</code></pre>

blocks|key|763174|text|您也可以尝试使用git+diff+--word-diff。它不完全是并排的，但不知何故更好，所以你可能更喜欢它而不是实际的并排需求。|type|unstyled|depth|inlineStyleRanges|offset|length|style|CODE|entityRanges|data|763175|entityMap^0|8|K|0^^$0|@$1|2|3|4|5|6|7|H|8|@$9|I|A|J|B|C]]|D|@]|E|$]]|$1|F|3|-4|5|6|7|K|8|@]|D|@]|E|$]]]|G|$]]

You can also try <code>git diff --word-diff</code>.
It's not exactly side-by-side, but somehow better, so you might prefer it to your actual side-by-side need.

blocks|key|546578|text|我使用colordiff。|type|unstyled|depth|inlineStyleRanges|entityRanges|offset|length|data|546579|在Mac+OS+X上，使用安装|546580|$+sudo+port+install+colordiff|code-block|syntax|javascript|546581|在Linux上可能是apt+get+install+colordiff或类似的东西，这取决于你的发行版。|style|CODE|546582|然后：|546583|$+git+difftool+--extcmd="colordiff+-ydw"+HEAD%5E+HEAD|546584|或创建别名|546585|$+git+alias+diffy+"difftool+--extcmd=\"colordiff+-ydw\""|546586|然后你就可以使用它了|546587|$+git+diffy+HEAD%5E+HEAD|546588|我称它为“diff”，因为diff+-y是unix中的并列比较。Colordiff还添加了更好的颜色。在选项-ydw中，y用于并排，w用于忽略空格，d用于产生最小的差异(通常您会得到更好的结果)|546589|entityMap|0|LINK|mutability|MUTABLE|url|http://colordiff.org/^0|3|9|0|0|0|0|A|P|0|0|0|0|0|0|0|D|7|1I|4|1O|1|1U|1|22|1|0^^$0|@$1|2|3|4|5|6|7|1A|8|@]|9|@$A|1B|B|1C|1|1D]]|C|$]]|$1|D|3|E|5|6|7|1E|8|@]|9|@]|C|$]]|$1|F|3|G|5|H|7|1F|8|@]|9|@]|C|$I|J]]|$1|K|3|L|5|6|7|1G|8|@$A|1H|B|1I|M|N]]|9|@]|C|$]]|$1|O|3|P|5|6|7|1J|8|@]|9|@]|C|$]]|$1|Q|3|R|5|H|7|1K|8|@]|9|@]|C|$I|J]]|$1|S|3|T|5|6|7|1L|8|@]|9|@]|C|$]]|$1|U|3|V|5|H|7|1M|8|@]|9|@]|C|$I|J]]|$1|W|3|X|5|6|7|1N|8|@]|9|@]|C|$]]|$1|Y|3|Z|5|H|7|1O|8|@]|9|@]|C|$I|J]]|$1|10|3|11|5|6|7|1P|8|@$A|1Q|B|1R|M|N]|$A|1S|B|1T|M|N]|$A|1U|B|1V|M|N]|$A|1W|B|1X|M|N]|$A|1Y|B|1Z|M|N]]|9|@]|C|$]]|$1|12|3|-4|5|6|7|20|8|@]|9|@]|C|$]]]|13|$14|$5|15|16|17|C|$18|19]]]]

I use <a href="http://colordiff.org" rel="noreferrer">colordiff</a>. 

On Mac OS X, install it with 

<pre><code>$ sudo port install colordiff
</code></pre>

On Linux is possibly <code>apt get install colordiff</code> or something like that, depending on your distro.

Then:

<pre><code>$ git difftool --extcmd="colordiff -ydw" HEAD^ HEAD
</code></pre>

Or create an alias

<pre><code>$ git alias diffy "difftool --extcmd=\"colordiff -ydw\""
</code></pre>

Then you can use it

<pre><code>$ git diffy HEAD^ HEAD
</code></pre>

I called it "diffy" because <code>diff -y</code> is the side-by-side diff in unix. Colordiff also adds colors, that are nicer.
In the option <code>-ydw</code>, the <code>y</code> is for the side-by-side, the <code>w</code> is to ignore whitespaces, and the <code>d</code> is to produce the minimal diff (usually you get a better result as diff)

blocks|key|546644|text|如果您希望在不涉及GitHub的情况下在浏览器中看到并排的差异，您可能会喜欢git+diff的临时替代品git+webdiff|type|unstyled|depth|inlineStyleRanges|offset|length|style|CODE|entityRanges|data|546645|$+pip+install+webdiff
$+git+webdiff|code-block|syntax|javascript|546646|与传统的图形用户界面差异工具(如tkdiff+)相比，这提供了许多优势，因为它可以为您提供语法突出显示和显示图像差异。|546647|有关它的更多信息，请阅读here。|546648|entityMap|0|LINK|mutability|MUTABLE|url|https://github.com/danvk/webdiff#git-webdiff|1|http://www.danvk.org/wp/2014-07-03/introducing-git-webdiff/^0|12|8|1G|B|0|0|0|G|6|0|C|4|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|@]|D|@$9|19|A|1A|1|1B]]|E|$]]|$1|O|3|-4|5|6|7|1C|8|@]|D|@]|E|$]]]|P|$Q|$5|R|S|T|E|$U|V]]|W|$5|R|S|T|E|$U|X]]]]

If you'd like to see side-by-side diffs in a browser without involving GitHub, you might enjoy <a href="https://github.com/danvk/webdiff#git-webdiff" rel="noreferrer">git webdiff</a>, a drop-in replacement for <code>git diff</code>:

<pre><code>$ pip install webdiff
$ git webdiff
</code></pre>

This offers a number of advantages over traditional GUI difftools like <code>tkdiff</code> in that it can give you syntax highlighting and show image diffs.

Read more about it <a href="http://www.danvk.org/wp/2014-07-03/introducing-git-webdiff/" rel="noreferrer">here</a>.

blocks|key|763344|text|我个人非常喜欢icdiff！|type|unstyled|depth|inlineStyleRanges|entityRanges|offset|length|data|763345|如果你和HomeBrew在Mac+OS+X上，就用brew+install+icdiff吧。|style|CODE|763346|为了获得正确的文件标签，以及其他很酷的功能，我在~/.gitconfig中有|763347|[pager]
++++difftool+=+true
[diff]
++++tool+=+icdiff
[difftool+"icdiff"]
++++cmd+=+icdiff+--head=5000+--highlight+--line-numbers+-L+\"$BASE\"+-L+\"$REMOTE\"+\"$LOCAL\"+\"$REMOTE\"|code-block|syntax|javascript|763348|我的用法如下：git+difftool|763349|entityMap|0|LINK|mutability|MUTABLE|url|https://github.com/jeffkaufman/icdiff^0|7|6|0|0|4|8|D|8|P|J|0|O|C|0|0|7|C|0^^$0|@$1|2|3|4|5|6|7|Y|8|@]|9|@$A|Z|B|10|1|11]]|C|$]]|$1|D|3|E|5|6|7|12|8|@$A|13|B|14|F|G]|$A|15|B|16|F|G]|$A|17|B|18|F|G]]|9|@]|C|$]]|$1|H|3|I|5|6|7|19|8|@$A|1A|B|1B|F|G]]|9|@]|C|$]]|$1|J|3|K|5|L|7|1C|8|@]|9|@]|C|$M|N]]|$1|O|3|P|5|6|7|1D|8|@$A|1E|B|1F|F|G]]|9|@]|C|$]]|$1|Q|3|-4|5|6|7|1G|8|@]|9|@]|C|$]]]|R|$S|$5|T|U|V|C|$W|X]]]]

I personally really like <a href="https://github.com/jeffkaufman/icdiff" rel="noreferrer">icdiff</a> !

If you're on <code>Mac OS X</code> with <code>HomeBrew</code>, just do <code>brew install icdiff</code>.

To get the file labels correctly, plus other cool features, I have in my <code>~/.gitconfig</code>:

<pre><code>[pager]
 difftool = true
[diff]
 tool = icdiff
[difftool "icdiff"]
 cmd = icdiff --head=5000 --highlight --line-numbers -L \"$BASE\" -L \"$REMOTE\" \"$LOCAL\" \"$REMOTE\"
</code></pre>

And I use it like: <code>git difftool</code>

blocks|key|546772|text|在这个帖子上有很多好的答案。我对这个问题的解决方案是编写一个脚本。|type|unstyled|depth|inlineStyleRanges|entityRanges|data|546773|将其命名为'+git+-scriptname‘(并使其可执行并将其放入您的路径中，就像任何脚本一样)，您可以像普通的git命令一样调用它，方法是运行以下命令|546774|$+git+scriptname|code-block|syntax|javascript|546775|实际的功能只是最后一行。以下是源代码：|546776|#!/usr/bin/env+zsh
#
#+++Show+a+side-by-side+diff+of+a+particular+file+how+it+currently+exists+between:
#+++++++*+the+file+system
#+++++++*+in+HEAD+(latest+committed+changes)

function+usage()+{
++++cat+<<-HERE
++++USAGE

++++$(basename+$1)+<file>

++++Show+a+side-by-side+diff+of+a+particular+file+between+the+current+versions:

++++++++*+on+the+file+system+(latest+edited+changes)
++++++++*+in+HEAD+(latest+committed+changes)

HERE
}

if+[[+$#+=+0+]];+then
++++usage+$0
++++exit
fi

file=$1
diff+-y+=(git+show+HEAD:$file)+$file+%7C+pygmentize+-g+%7C+less+-R|546777|entityMap^0|0|0|0|0|0^^$0|@$1|2|3|4|5|6|7|O|8|@]|9|@]|A|$]]|$1|B|3|C|5|6|7|P|8|@]|9|@]|A|$]]|$1|D|3|E|5|F|7|Q|8|@]|9|@]|A|$G|H]]|$1|I|3|J|5|6|7|R|8|@]|9|@]|A|$]]|$1|K|3|L|5|F|7|S|8|@]|9|@]|A|$G|H]]|$1|M|3|-4|5|6|7|T|8|@]|9|@]|A|$]]]|N|$]]

There are a lot of good answers on this thread. My solution for this issue was to write a script.

Name this 'git-scriptname' (and make it executable and put it in your PATH, like any script), and you can invoke it like a normal git command by running

<pre><code>$ git scriptname
</code></pre>

The actual functionality is just the last line. Here's the source:

<pre><code>#!/usr/bin/env zsh
#
# Show a side-by-side diff of a particular file how it currently exists between:
# * the file system
# * in HEAD (latest committed changes)

function usage() {
 cat &lt;&lt;-HERE
 USAGE

 $(basename $1) &lt;file&gt;

 Show a side-by-side diff of a particular file between the current versions:

 * on the file system (latest edited changes)
 * in HEAD (latest committed changes)

HERE
}

if [[ $# = 0 ]]; then
 usage $0
 exit
fi

file=$1
diff -y =(git show HEAD:$file) $file | pygmentize -g | less -R
</code></pre>

blocks|key|546858|text|这是一种方法。如果你通过less管道，xterm的宽度被设置为80，这不是很热。但是，如果您继续使用命令，例如COLS=210，您可以使用扩展的xterm。|type|unstyled|depth|inlineStyleRanges|entityRanges|data|546859|gitdiff()
{
++++local+width=${COLS:-$(tput+cols)}
++++GIT_EXTERNAL_DIFF="diff+-yW$width+\$2+\$5;+echo+>/dev/null"+git+diff+"$@"
}|code-block|syntax|javascript|546860|entityMap^0|0|0^^$0|@$1|2|3|4|5|6|7|I|8|@]|9|@]|A|$]]|$1|B|3|C|5|D|7|J|8|@]|9|@]|A|$E|F]]|$1|G|3|-4|5|6|7|K|8|@]|9|@]|A|$]]]|H|$]]

Here's an approach. If you pipe through less, the xterm width is set to 80, which ain't so hot. But if you proceed the command with, e.g. COLS=210, you can utilize your expanded xterm.

<pre><code>gitdiff()
{
 local width=${COLS:-$(tput cols)}
 GIT_EXTERNAL_DIFF="diff -yW$width \$2 \$5; echo &gt;/dev/null" git diff "$@"
}
</code></pre>

blocks|key|546940|text|您可以使用sdiff执行并行diff，如下所示：|type|unstyled|depth|inlineStyleRanges|offset|length|style|CODE|entityRanges|data|546941|$+git+difftool+-y+-x+sdiff++HEAD%5E+%7C+less|code-block|syntax|javascript|546942|其中HEAD%5E是一个示例，您应该将其替换为您想要与之不同的任何内容。|546943|我找到了这个解决方案here，还有一些其他的建议。然而，这一个答案简洁而清晰地回答了操作员的问题。|546944|有关参数的说明，请参阅man+git-difftool。|546945|546946|考虑到这些注释，您可以通过编写以下可执行脚本来创建一个方便的git+sdiff命令：|546947|#!/bin/sh
git+difftool+-y+-x+"sdiff+-w+$(tput+cols)"+"${@}"+%7C+less|546948|将其另存为/usr/bin/git-sdiff并对其执行chmod+%2Bx。然后你就可以这样做了：|546949|$+git+sdiff+HEAD%5E|546950|额外提示|546951|按照注释中的建议，您可以使用icdiff来执行sdiff对彩色输出所做的操作：|546952|$+more+/usr/bin/git-sdiff
#!/bin/sh
git+difftool+-y+-x+"icdiff+--cols=$(tput+cols)"+"${@}"+%7C+less|546953|entityMap|0|LINK|mutability|MUTABLE|url|https://coderwall.com/p/pa5whg/git-side-by-side-diff-in-terminal|1|https://git-scm.com/docs/git-difftool^0|5|5|E|4|0|0|2|5|0|A|4|0|0|B|G|1|0|0|U|9|0|0|5|I|S|8|0|0|0|E|6|N|5|0|0^^$0|@$1|2|3|4|5|6|7|1F|8|@$9|1G|A|1H|B|C]|$9|1I|A|1J|B|C]]|D|@]|E|$]]|$1|F|3|G|5|H|7|1K|8|@]|D|@]|E|$I|J]]|$1|K|3|L|5|6|7|1L|8|@$9|1M|A|1N|B|C]]|D|@]|E|$]]|$1|M|3|N|5|6|7|1O|8|@]|D|@$9|1P|A|1Q|1|1R]]|E|$]]|$1|O|3|P|5|6|7|1S|8|@]|D|@$9|1T|A|1U|1|1V]]|E|$]]|$1|Q|3|-4|5|6|7|1W|8|@]|D|@]|E|$]]|$1|R|3|S|5|6|7|1X|8|@$9|1Y|A|1Z|B|C]]|D|@]|E|$]]|$1|T|3|U|5|H|7|20|8|@]|D|@]|E|$I|J]]|$1|V|3|W|5|6|7|21|8|@$9|22|A|23|B|C]|$9|24|A|25|B|C]]|D|@]|E|$]]|$1|X|3|Y|5|H|7|26|8|@]|D|@]|E|$I|J]]|$1|Z|3|10|5|6|7|27|8|@]|D|@]|E|$]]|$1|11|3|12|5|6|7|28|8|@$9|29|A|2A|B|C]|$9|2B|A|2C|B|C]]|D|@]|E|$]]|$1|13|3|14|5|H|7|2D|8|@]|D|@]|E|$I|J]]|$1|15|3|-4|5|6|7|2E|8|@]|D|@]|E|$]]]|16|$17|$5|18|19|1A|E|$1B|1C]]|1D|$5|18|19|1A|E|$1B|1E]]]]

You can do a side-by-side <code>diff</code> using <code>sdiff</code> as follows:
<pre><code>$ git difftool -y -x sdiff HEAD^ | less
</code></pre>
where <code>HEAD^</code> is an example that you should replace with whatever you want to diff against.
I found this solution <a href="https://coderwall.com/p/pa5whg/git-side-by-side-diff-in-terminal" rel="noreferrer">here</a> where there are a couple of other suggestions also. However, this one answer's the OP's question succinctly and clearly.
See the <a href="https://git-scm.com/docs/git-difftool" rel="noreferrer">man git-difftool</a> for an explanation of the arguments.
<hr />
Taking the comments on board, you can create a handy <code>git sdiff</code> command by writing the following executable script:
<pre><code>#!/bin/sh
git difftool -y -x &quot;sdiff -w $(tput cols)&quot; &quot;${@}&quot; | less
</code></pre>
Save it as <code>/usr/bin/git-sdiff</code> and <code>chmod +x</code> it. Then you'll be able to do this:
<pre><code>$ git sdiff HEAD^
</code></pre>
<h3>Extra Tip</h3>
As suggested in comments you can use <code>icdiff</code> to do what <code>sdiff</code> does with colored output:
<pre><code>$ more /usr/bin/git-sdiff
#!/bin/sh
git difftool -y -x &quot;icdiff --cols=$(tput cols)&quot; &quot;${@}&quot; | less
</code></pre>

blocks|key|547170|text|打开Intellij+IDEA，在“版本控制”工具窗口中选择一个或多个提交，浏览更改的文件，双击它们可以并排检查每个文件的更改。|type|unstyled|depth|inlineStyleRanges|entityRanges|offset|length|data|547171|使用捆绑的命令行启动器，您可以通过一个简单的idea+some/path在任何地方打开IDEA|style|CODE|547172|​|547173|📷|atomic|547174|547175|547176|entityMap|0|LINK|mutability|MUTABLE|url|https://www.jetbrains.com/idea/|1|IMAGE|IMMUTABLE|imageUrl|https://ask.qcloudimg.com/http-save/yehe-900000/73d8e478f4b24e309e0a2595929d4983.png|imageAlt|2|https://ask.qcloudimg.com/http-save/yehe-900000/754036d44633dcd9270fd6678b65273e.png^0|2|D|0|0|M|E|0|0|0|1|1|0|0|1|2|0|0^^$0|@$1|2|3|4|5|6|7|14|8|@]|9|@$A|15|B|16|1|17]]|C|$]]|$1|D|3|E|5|6|7|18|8|@$A|19|B|1A|F|G]]|9|@]|C|$]]|$1|H|3|I|5|6|7|1B|8|@]|9|@]|C|$]]|$1|J|3|K|5|L|7|1C|8|@]|9|@$A|1D|B|1E|1|1F]]|C|$]]|$1|M|3|K|5|L|7|1G|8|@]|9|@$A|1H|B|1I|1|1J]]|C|$]]|$1|N|3|I|5|6|7|1K|8|@]|9|@]|C|$]]|$1|O|3|-4|5|6|7|1L|8|@]|9|@]|C|$]]]|P|$Q|$5|R|S|T|C|$U|V]]|W|$5|X|S|Y|C|$Z|10|11|-4]]|12|$5|X|S|Y|C|$Z|13|11|-4]]]]

Open <a href="https://www.jetbrains.com/idea/" rel="nofollow noreferrer">Intellij IDEA</a>, select a single or multiple commits in the "Version Control" tool window, browse changed files, and double click them to inspect changes side by side for each file.

With the bundled command-line launcher you can bring IDEA up anywhere with a simple <code>idea some/path</code>

<a href="https://i.stack.imgur.com/K71eC.png" rel="nofollow noreferrer"><img src="https://i.stack.imgur.com/K71eC.png" alt="version control view"></a>
<a href="https://i.stack.imgur.com/7p0OM.png" rel="nofollow noreferrer"><img src="https://i.stack.imgur.com/7p0OM.png" alt="diff view"></a>

blocks|key|547265|text|其他几个人已经提到了用于git并列差异的cdiff，但没有人给出它的完整实现。|type|unstyled|depth|inlineStyleRanges|entityRanges|offset|length|data|547266|设置差值：|547267|git+clone+https://github.com/ymattw/cdiff.git
cd+cdiff
ln+-s+`pwd`/cdiff+~/bin/cdiff
hash+-r+#+refresh+your+PATH+executable+in+bash+(or+'rehash'+if+you+use+tcsh)
++++++++#+or+just+create+a+new+terminal|code-block|syntax|javascript|547268|编辑~/.gitconfig插入以下行：|547269|[pager]
++++++++diff+=+false
++++++++show+=+false

[diff]
++++++++tool+=+cdiff
++++++++external+=+"cdiff+-s+$2+$5+#"

[difftool+"cdiff"]
++++++++cmd+=+cdiff+-s+\"$LOCAL\"+\"$REMOTE\"

[alias]
++++++++showw+=+show+--ext-dif|547270|cdiff需要pager+off才能与Diff一起工作，它本质上是一个pager，所以这很好。无论这些设置如何，Difftool都将工作。|547271|需要使用show别名，因为git+show只支持通过参数的外部diff工具。|547272|diff外部命令末尾的'#‘很重要。Git的diff命令将一个$@+(所有可用的diff变量)附加到diff命令中，但我们只需要这两个文件名。因此，我们使用$2和$5显式地调用这两个，然后将$@隐藏在注释后面，否则会混淆sdiff。导致错误，如下所示：|547273|fatal:+<FILENAME>:+no+such+path+in+the+working+tree
Use+'git+<command>+--+<path>...'+to+specify+paths+that+do+not+exist+locally.|547274|Git命令现在可以产生并排差异：|547275|git+diff+<SHA1>+<SHA2>+
git+difftool+<SHA1>+<SHA2>
git+showw+<SHA>|547276|Cdiff用法：|547277|'SPACEBAR'+-+Advances+the+page+of+the+current+file.
'Q'++++++++-+Quits+current+file,+thus+advancing+you+to+the+next+file.|547278|您现在可以通过git+diff和difftool并排使用diff。如果您需要的话，您还拥有用于高级用户定制的cdiff+python源代码。|547279|entityMap|0|LINK|mutability|MUTABLE|url|https://github.com/ymattw/cdiff^0|K|5|0|0|0|0|0|0|0|0|0|0|0|0|0|0|0^^$0|@$1|2|3|4|5|6|7|1E|8|@]|9|@$A|1F|B|1G|1|1H]]|C|$]]|$1|D|3|E|5|6|7|1I|8|@]|9|@]|C|$]]|$1|F|3|G|5|H|7|1J|8|@]|9|@]|C|$I|J]]|$1|K|3|L|5|6|7|1K|8|@]|9|@]|C|$]]|$1|M|3|N|5|H|7|1L|8|@]|9|@]|C|$I|J]]|$1|O|3|P|5|6|7|1M|8|@]|9|@]|C|$]]|$1|Q|3|R|5|6|7|1N|8|@]|9|@]|C|$]]|$1|S|3|T|5|6|7|1O|8|@]|9|@]|C|$]]|$1|U|3|V|5|H|7|1P|8|@]|9|@]|C|$I|J]]|$1|W|3|X|5|6|7|1Q|8|@]|9|@]|C|$]]|$1|Y|3|Z|5|H|7|1R|8|@]|9|@]|C|$I|J]]|$1|10|3|11|5|6|7|1S|8|@]|9|@]|C|$]]|$1|12|3|13|5|H|7|1T|8|@]|9|@]|C|$I|J]]|$1|14|3|15|5|6|7|1U|8|@]|9|@]|C|$]]|$1|16|3|-4|5|6|7|1V|8|@]|9|@]|C|$]]]|17|$18|$5|19|1A|1B|C|$1C|1D]]]]

Several others already mentioned <a href="https://github.com/ymattw/cdiff" rel="nofollow noreferrer">cdiff</a> for git side-by-side diffing but no one gave a full implementation of it. 

Setup cdiff:

<pre><code>git clone https://github.com/ymattw/cdiff.git
cd cdiff
ln -s `pwd`/cdiff ~/bin/cdiff
hash -r # refresh your PATH executable in bash (or 'rehash' if you use tcsh)
 # or just create a new terminal
</code></pre>

Edit ~/.gitconfig inserting these lines:

<pre><code>[pager]
 diff = false
 show = false

[diff]
 tool = cdiff
 external = "cdiff -s $2 $5 #"

[difftool "cdiff"]
 cmd = cdiff -s \"$LOCAL\" \"$REMOTE\"

[alias]
 showw = show --ext-dif
</code></pre>

The pager off is needed for cdiff to work with Diff, it is essentially a pager anyway so this is fine. Difftool will work regardless of these settings.

The show alias is needed because git show only supports external diff tools via argument.

The '#' at the end of the diff external command is important. Git's diff command appends a $@ (all available diff variables) to the diff command, but we only want the two filenames. So we call out those two explicitly with $2 and $5, and then hide the $@ behind a comment which would otherwise confuse sdiff. Resulting in an error that looks like:

<pre><code>fatal: &lt;FILENAME&gt;: no such path in the working tree
Use 'git &lt;command&gt; -- &lt;path&gt;...' to specify paths that do not exist locally.
</code></pre>

Git commands that now produce side-by-side diffing:

<pre><code>git diff &lt;SHA1&gt; &lt;SHA2&gt; 
git difftool &lt;SHA1&gt; &lt;SHA2&gt;
git showw &lt;SHA&gt;
</code></pre>

Cdiff usage:

<pre><code>'SPACEBAR' - Advances the page of the current file.
'Q' - Quits current file, thus advancing you to the next file.
</code></pre>

You now have side-by-side diff via git diff and difftool. And you have the cdiff python source code for power user customization should you need it.

blocks|key|764072|text|对于unix，仅结合使用git和内置的diff|type|unstyled|depth|inlineStyleRanges|offset|length|style|CODE|entityRanges|data|764073|git+show+HEAD:path/to/file+%7C+diff+-y+-+path/to/file|code-block|syntax|javascript|764074|当然，您可以使用任何其他git引用替换HEAD，并且您可能希望在diff命令中添加类似-W+170的内容。|764075|这假设您只是将目录内容与过去的提交进行比较。两次提交之间的比较更加复杂。如果你的外壳是bash，你可以使用“进程替换”：|764076|diff+-y+-W+170+<(git+show+REF1:path/to/file)+<(git+show+REF2:path/to/file)|764077|其中REF1和REF2是git引用-标签、分支或散列。|764078|entityMap^0|C|3|J|4|0|0|17|6|0|17|4|0|0|2|4|7|4|0^^$0|@$1|2|3|4|5|6|7|U|8|@$9|V|A|W|B|C]|$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|@$9|11|A|12|B|C]]|D|@]|E|$]]|$1|M|3|N|5|6|7|13|8|@$9|14|A|15|B|C]]|D|@]|E|$]]|$1|O|3|P|5|H|7|16|8|@]|D|@]|E|$I|J]]|$1|Q|3|R|5|6|7|17|8|@$9|18|A|19|B|C]|$9|1A|A|1B|B|C]]|D|@]|E|$]]|$1|S|3|-4|5|6|7|1C|8|@]|D|@]|E|$]]]|T|$]]

For unix, combining just <code>git</code> and the built-in <code>diff</code>:

<pre><code>git show HEAD:path/to/file | diff -y - path/to/file
</code></pre>

Of course, you can replace HEAD with any other git reference, and you probably want to add something like <code>-W 170</code> to the diff command.

This assumes that you are just comparing your directory contents with a past commit. Comparing between two commits is more complex. If your shell is <code>bash</code> you can use "process substitution":

<pre><code>diff -y -W 170 &lt;(git show REF1:path/to/file) &lt;(git show REF2:path/to/file)
</code></pre>

where <code>REF1</code> and <code>REF2</code> are git references – tags, branches or hashes.

blocks|key|547474|text|我最近实现了一个执行此操作的工具：https://github.com/banga/git-split-diffs|type|unstyled|depth|inlineStyleRanges|entityRanges|offset|length|data|547475|下面是它的使用方法：|547476|npm+install+-g+git-split-diffs

git+config+--global+core.pager+"git-split-diffs+--color+%7C+less+-RFX"|code-block|syntax|javascript|547477|这是它在终端中的外观(使用默认主题)：|547478|​|547479|📷|atomic|547480|547481|如您所见，它还支持语法高亮显示和高亮显示行内更改的单词|547482|entityMap|0|LINK|mutability|MUTABLE|url|https://github.com/banga/git-split-diffs|1|IMAGE|IMMUTABLE|imageUrl|https://ask.qcloudimg.com/http-save/yehe-900000/a57cffca9b839bd2261768dfa8994637.jpeg|imageAlt^0|H|14|0|0|0|0|0|0|0|1|1|0|0|0^^$0|@$1|2|3|4|5|6|7|18|8|@]|9|@$A|19|B|1A|1|1B]]|C|$]]|$1|D|3|E|5|6|7|1C|8|@]|9|@]|C|$]]|$1|F|3|G|5|H|7|1D|8|@]|9|@]|C|$I|J]]|$1|K|3|L|5|6|7|1E|8|@]|9|@]|C|$]]|$1|M|3|N|5|6|7|1F|8|@]|9|@]|C|$]]|$1|O|3|P|5|Q|7|1G|8|@]|9|@$A|1H|B|1I|1|1J]]|C|$]]|$1|R|3|N|5|6|7|1K|8|@]|9|@]|C|$]]|$1|S|3|T|5|6|7|1L|8|@]|9|@]|C|$]]|$1|U|3|-4|5|6|7|1M|8|@]|9|@]|C|$]]]|V|$W|$5|X|Y|Z|C|$10|11]]|12|$5|13|Y|14|C|$15|16|17|-4]]]]

I recently implemented a tool that does exactly this: <a href="https://github.com/banga/git-split-diffs" rel="nofollow noreferrer">https://github.com/banga/git-split-diffs</a>
Here's how to use it:
<pre><code>npm install -g git-split-diffs

git config --global core.pager &quot;git-split-diffs --color | less -RFX&quot;
</code></pre>
And this is how it looks in your terminal (with the default theme):
<a href="https://i.stack.imgur.com/edfeV.jpg" rel="nofollow noreferrer"><img src="https://i.stack.imgur.com/edfeV.jpg" alt="Preview of side by side diffs" /></a>
As you can see, it also supports syntax highlighting and highlighting changed words within lines

When I type "git diff", I'd like to see a side-by-side diff, like with "diff -y", or like to display the diff in an interactive diff tool like "kdiff3". How can this be done?

How can I get a side-by-side diff when I do "git diff"?

GitHub

Linux

当我输入"git diff“时，我希望看到一个并排的比较，就像输入”diff -y“一样，或者想要在交互式比较工具中显示比较结果，比如"kdiff3”。如何做到这一点？

问当我做"git diff“时，我如何得到一个并排的diff？
EN

社区

活动

资源

关于

腾讯云开发者

热门产品

热门推荐

更多推荐

问当我做"git diff“时，我如何得到一个并排的diff？EN

社区

活动

资源

关于

腾讯云开发者

热门产品

热门推荐

更多推荐

问当我做"git diff“时，我如何得到一个并排的diff？
EN