Git diff 没有列出对文件的特定更改？

Question

我一直在尝试添加和提交，并使用 diff显示 HEAD、索引和工作目录之间的差异。使用 diff ，我的理解是它应该指定哪些文件已更改，但也应该指定文件之间的差异(例如，如果我将“hello”写入文件，它应该说 +hello (或类似的东西)当我运行 diff 并比较两者时)。

当我使用 diff 时，但是，它只告诉我文件已更改；它没有显示这些变化是什么。为什么它不显示文件中的个别更改——我添加的实际文本、我具体删除的内容等等？如果diff不这样做，是否有我可以使用的命令？

谢谢。

---

为了运行完整测试，我删除了 .git并运行 git-init , 然后找到 diff没有显示 diff 的所有三个变体的差异( git diff 、 git diff --cached 和 git diff HEAD )。我使用的文件是t.txt .这是我的控制台，为了便于阅读，我对其进行了格式化； >>是 Powershell 提示输入的地方，我在控制台中输入了该输入；评论是我去的时候写的，用>> # <comment>表示.这是我的控制台输出:

>> # Starting with nothing.

>> git status
fatal: Not a git repository (or any of the parent directories): .git

>> git init
Initialized empty Git repository in C:/Users/q/Documents/GitHub/.git/

>> ls

>> git status
On branch master
Initial commit
nothing to commit (create/copy files and use "git add" to track)

>> echo "New file created." > t.txt

>> git status
On branch master
Initial commit
Untracked files:
  (use "git add <file>..." to include in what will be committed)
        t.txt
nothing added to commit but untracked files present (use "git add" to track)


>> git add .

>> git status
On branch master
Initial commit
Changes to be committed:
  (use "git rm --cached <file>..." to unstage)
        new file:   t.txt


>> #open t.txt and add a second line of text to it

>> git status
On branch master
Initial commit
Changes to be committed:
  (use "git rm --cached <file>..." to unstage)
       new file:   t.txt
Changes not staged for commit:
  (use "git add <file>..." to update what will be committed)
  (use "git checkout -- <file>..." to discard changes in working directory)
        modified:   t.txt


>> git diff
diff --git a/t.txt b/t.txt
index e7a4f8a..fe91a49 100644
Binary files a/t.txt and b/t.txt differ

>> #How can I see the exact change?
>> #Something like: '''
>> #
>> # + This is the added line.
>> #
>> # ''' in the diff?


>> # I can take this even further by making the first commit, modifying, then staging the file 
                              # with `git add`, then editing again, and then run all three `git-diff`s 
                              # (git diff, git diff --cached, git diff HEAD) and none of them will specify any actual 
                              # changes in the files; Git still just lists the files that have discrepancies, without 
                              # listing any of the detials about /what/ is actually different.


>> git add .

>> git commit -m "Committed with the second line."
[master (root-commit) 14acc45] Committed with the second line.
 1 file changed, 0 insertions(+), 0 deletions(-)
 create mode 100644 t.txt

>> git diff

>> git log
commit 14acc455b16ba26cdea1661166b0ffc3fa089784
Author: q <q@gmail.com>
Date:   Sat Nov 7 04:29:20 2015 -0800
    Committed with the second line.

>> git diff HEAD

>> git diff HEAD^
fatal: ambiguous argument 'HEAD^': unknown revision or path not in the working tree.
Use '--' to separate paths from revisions, like this:
'git <command> [<revision>...] -- [<file>...]'


>> #We change the file again to add a third line


>> git status
On branch master
Changes not staged for commit:
  (use "git add <file>..." to update what will be committed)
  (use "git checkout -- <file>..." to discard changes in working directory)
        modified:   t.txt
no changes added to commit (use "git add" and/or "git commit -a")


>> git diff
diff --git a/t.txt b/t.txt
index fe91a49..006c33a 100644
Binary files a/t.txt and b/t.txt differ


>> git diff HEAD
diff --git a/t.txt b/t.txt
index fe91a49..006c33a 100644
Binary files a/t.txt and b/t.txt differ


>> git add .

>> #Modify file again.

>> git status
On branch master
Changes to be committed:
  (use "git reset HEAD <file>..." to unstage)
        modified:   t.txt
Changes not staged for commit:
  (use "git add <file>..." to update what will be committed)
  (use "git checkout -- <file>..." to discard changes in working directory)
        modified:   t.txt


>> git diff
diff --git a/t.txt b/t.txt
index 006c33a..57a6754 100644
Binary files a/t.txt and b/t.txt differ

>> git diff HEAD
diff --git a/t.txt b/t.txt
index fe91a49..57a6754 100644
Binary files a/t.txt and b/t.txt differ

>> git diff --cached
diff --git a/t.txt b/t.txt
index fe91a49..006c33a 100644
Binary files a/t.txt and b/t.txt differ

>>## But how do they differ?

Answer 1

如果文件太小，git 不知道如何解释它(测试或二进制):参见“Why does Git treat this text file as a binary file?”

您可以强制文本差异:

git diff --text

(或者您可以将 configure it 作为文本)