如何显示Git中未提交的更改和一些Git差异

Question

如何在Git中显示未提交的更改？

I STFW‘’ed，并且这些命令不起作用：

teyan@TEYAN-THINK MINGW64 /d/nano/repos/PSTools/psservice (teyan/psservice)
$ git status
On branch teyan/psservice
Your branch is up-to-date with 'origin/teyan/psservice'.
Changes to be committed:
  (use "git reset HEAD <file>..." to unstage)

        modified:   psservice.c
        modified:   psservice.vcxproj.filters


teyan@TEYAN-THINK MINGW64 /d/nano/repos/PSTools/psservice (teyan/psservice)
$ git diff

teyan@TEYAN-THINK MINGW64 /d/nano/repos/PSTools/psservice (teyan/psservice)
$ git diff master
fatal: ambiguous argument 'master': unknown revision or path not in the working tree.
Use '--' to separate paths from revisions, like this:
'git <command> [<revision>...] -- [<file>...]'

Answer 1

如何显示Git中未提交的更改

您要查找的命令是https://git-scm.com/docs/git-diff。

git diff -显示提交、提交和工作树之间的更改，等等

下面是它公开的一些选项，您可以使用

git diff (无参数)

打印出工作目录和索引之间的差异。

git diff --cached

打印出索引和HEAD之间的差异(当前提交)。

git diff HEAD

打印出工作目录和HEAD之间的差异。

git diff --name-only

只显示已更改文件的名称。

git diff --name-status

只显示已更改文件的名称和状态。

git diff --color-words

逐字逐句，而不是一行行。

下面是git diff --color-words输出的示例

​

​

​

​

Answer 2

您已经进行了更改(大概是通过运行git add)，因此为了获得它们的差异，您需要运行：

git diff --cached

(普通的git diff只显示未分阶段的更改。)

例如：

​

Answer 3

对我来说，唯一起作用的是

git diff HEAD

包括阶段性文件，git diff --cached只显示阶段性文件。