X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=Documentation%2Fgit-diff-index.txt;h=7bd262cefd68efe84ff0c405af5eabcdc6f01be8;hb=82527cf33e59308b86cf3defe9ae0f5c2367a012;hp=9cd43f105bd78778359ded7c6b3300502d642ca9;hpb=7fb23e6083dbefa8eb4c554d8b2cd5a6292b2df4;p=git.git diff --git a/Documentation/git-diff-index.txt b/Documentation/git-diff-index.txt index 9cd43f105..7bd262cef 100644 --- a/Documentation/git-diff-index.txt +++ b/Documentation/git-diff-index.txt @@ -54,7 +54,7 @@ If '--cached' is specified, it allows you to ask: For example, let's say that you have worked on your working directory, updated some files in the index and are ready to commit. You want to see exactly -*what* you are going to commit is without having to write a new tree +*what* you are going to commit, without having to write a new tree object and compare it that way, and to do that, you just do git-diff-index --cached HEAD @@ -68,14 +68,14 @@ matches my working directory. But doing a "git-diff-index" does: -100644 blob 4161aecc6700a2eb579e842af0b7f22b98443f74 commit.c +100644 blob 4161aecc6700a2eb579e842af0b7f22b98443f74 git-commit.c -You can trivially see that the above is a rename. +You can see easily that the above is a rename. In fact, "git-diff-index --cached" *should* always be entirely equivalent to actually doing a "git-write-tree" and comparing that. Except this one is much nicer for the case where you just want to check where you are. So doing a "git-diff-index --cached" is basically very useful when you are -asking yourself "what have I already marked for being committed, and +asking yourself "what have I already marked for being committed, and what's the difference to a previous tree". Non-cached Mode @@ -130,4 +130,3 @@ Documentation by David Greaves, Junio C Hamano and the git-list