git diff两个文件在同一个分支上，同一个提交

Question

sorry if this question exists, I surprisingly could not find it :/

How can I perform a git diff between two files within the same branch & same commit?

ie git diff fileA.php fileB.php

(ideally with the easy to read color coding that git offers....or similar to what the program BeyondCompare does!)

Answer 1

If you want to use git diff on two arbitrary files you can use git diff --no-index <file_a> <file_b> . The two files do not need to be tracked in git for this to work.

Answer 2

你不需要git，只需使用diff fileA.php fileB.php （如果想要并排比较，则使用vimdiff）

Answer 3

If the files you want to compare are in your working copy, you can use simply diff as pointed by the others, however if the files are in some revision you can specify a revision for each file

git diff <revision_1>:<file_1> <revision_2>:<file_2>

as noted here: https://stackoverflow.com/a/3343506/1815446

In your case (specifying the same revision for both files):

git diff <revisionX>:fileA.php <revisionX>:fileB.php

Answer 4

To make regular gnu diff look more like git diff, I would recommend these parameters:

diff -burN file_or_dir1 file_or_dir2

(where -b ignore spaces, -u unified diff, -r recursive, -N treat missing files as /dev/null ).

It works great, but still does not have colors and git-style auto-paging is virtually absent. If you want to fix both (I do), install colordiff and use it like this:

colordiff -burN file_or_dir1 file_or_dir2 | less -R

This gives output and interface that is very close to actual git diff .

Answer 5

如果要在同一目录中区分两个本地文件，只需使用diff。

diff fileA.php fileB.php

Answer 6

只需使用常规差异。

diff -Nua fileA.php fileB.php