X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=Documentation%2Fgit-diff-index.txt;h=8b6a953c03aa7971f8f7e6e7b7573c4b0fa64007;hb=df8baa42fe4eeb5a021ac262caf601f44d2a5746;hp=56ed673edaa8f484e3a88272f74aac0121667b3e;hpb=5a82b4fb3e547c4aa14cd417790b3f925713a422;p=git.git diff --git a/Documentation/git-diff-index.txt b/Documentation/git-diff-index.txt index 56ed673e..8b6a953c 100644 --- a/Documentation/git-diff-index.txt +++ b/Documentation/git-diff-index.txt @@ -86,8 +86,8 @@ the more useful of the two in that what it does can't be emulated with a "git-write-tree" + "git-diff-tree". Thus that's the default mode. The non-cached version asks the question: - show me the differences between HEAD and the currently checked out - tree - index contents _and_ files that aren't up-to-date + show me the differences between HEAD and the currently checked out + tree - index contents _and_ files that aren't up-to-date which is obviously a very useful question too, since that tells you what you *could* commit. Again, the output matches the "git-diff-tree -r" @@ -107,13 +107,13 @@ not up-to-date and may contain new stuff. The all-zero sha1 means that to get the real diff, you need to look at the object in the working directory directly rather than do an object-to-object diff. -NOTE! As with other commands of this type, "git-diff-index" does not +NOTE: As with other commands of this type, "git-diff-index" does not actually look at the contents of the file at all. So maybe `kernel/sched.c` hasn't actually changed, and it's just that you touched it. In either case, it's a note that you need to "git-upate-cache" it to make the cache be in sync. -NOTE 2! You can have a mixture of files show up as "has been updated" +NOTE: You can have a mixture of files show up as "has been updated" and "is still dirty in the working directory" together. You can always tell which file is in which state, since the "has been updated" ones show a valid sha1, and the "not in sync with the index" ones will