两个不同文件之间的git diff

Question

In HEAD (the latest commit), I have a file named foo . In my current working tree, I renamed it to bar , and also edited it.

I want to git diff foo in HEAD , and bar in my current working tree.

Answer 1

Specify the paths explicitly:

git diff HEAD:full/path/to/foo full/path/to/bar

Check out the --find-renames option in the git-diff docs .

Credit: twaggs .

Answer 2

I believe using --no-index is what you're looking for:

git diff [<options>] --no-index [--] <path> <path>

as mentioned in the git manual:

This form is to compare the given two paths on the filesystem. You can omit the --no-index option when running the command in a working tree controlled by Git and at least one of the paths points outside the working tree, or when running the command outside a working tree controlled by Git.

Answer 3

如果您使用的是 tortoise git，您可以右键单击一个文件并通过以下方式 git diff：右键单击第一个文件并通过 tortoisegit 子菜单选择“稍后比较”然后在第二个文件上您也可以右键单击此文件，转到 tortoisegit 子菜单，然后选择“Diff with yourfilenamehere.txt”

Answer 4

使用PhpStorm，我只复制了先前的提交代码，并使用内置的“与剪贴板比较”工具将其与当前版本进行比较。