假设您没有本地提交，

git diff origin/master

更新:我的答案是阶段性和非阶段性的变化。不被追踪和不被追踪。查看已跟踪/未跟踪信息的可接受答案。留给子孙后代。

下面只会给你非阶段性的变化:

$ git diff

如果你想要阶段性和非阶段性的变化，在命令中添加HEAD:

$ git diff HEAD

通常，当我与远程位置团队一起工作时，在我遵循git阶段untrack- > staging ->commit之前，我事先了解其他团队在同一个文件中所做的更改对我来说很重要 为此，我写了一个bash脚本，这有助于我避免不必要的解决合并冲突与远程团队或使新的本地分支，并比较和合并在主分支

#set -x 
branchname=`git branch | grep -F '*' |  awk '{print $2}'`
echo $branchname
git fetch origin ${branchname}
for file in `git status | grep "modified" | awk "{print $2}" `
do
echo "PLEASE CHECK OUT GIT DIFF FOR "$file 
git difftool FETCH_HEAD $file ;
done

在上面的脚本中，我获取远程主分支(不需要它的主分支)到FETCH_HEAD，它们只列出我修改过的文件，并将修改过的文件与git difftool进行比较

这里git支持许多difftools。我配置'Meld Diff查看器'为良好的GUI比较。

我相信您可以通过简单地提供两个文件的路径来区分索引文件和未跟踪文件中的文件。

git diff --no-index tracked_file untracked_file

假设您没有本地提交，

git diff origin/master

对于我的交互式日常获取(我一直在根据HEAD对工作树进行差异，并且希望在diff中包含未跟踪的文件)，add -N/——intent-to-add是不可用的，因为它破坏了git stash。

这是我的git diff替换。这不是一个特别干净的解决方案，但因为我真的只是交互地使用它，所以我可以接受一个hack:

d() {
    if test "$#" = 0; then
        (
            git diff --color
            git ls-files --others --exclude-standard |
                while read -r i; do git diff --color -- /dev/null "$i"; done
        ) | `git config --get core.pager`
    else
        git diff "$@"
    fi
}

只输入d将包括diff中未跟踪的文件(这是我在我的工作流中关心的)，d参数…将表现得像普通的git差异。

注:

We're using the fact here that git diff is really just individual diffs concatenated, so it's not possible to tell the d output from a "real diff" -- except for the fact that all untracked files get sorted last. The only problem with this function is that the output is colorized even when redirected; but I can't be bothered to add logic for that. I couldn't find any way to get untracked files included by just assembling a slick argument list for git diff. If someone figures out how to do this, or if maybe a feature gets added to git at some point in the future, please leave a note here!