diff options
| author | Junio C Hamano <gitster@pobox.com> | 2022-07-11 16:08:34 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2022-07-11 16:08:34 -0700 |
| commit | 7bc735932830b9840daeff68819d626c3b0cd07b (patch) | |
| tree | 6c36713b44abd490cd78976f7ad2839a9268abd3 /git-diff-index.txt | |
| parent | ebdf143ff06ab8a67139c290755d6c6ecfe3126b (diff) | |
| download | git-htmldocs-7bc735932830b9840daeff68819d626c3b0cd07b.tar.gz | |
Autogenerated HTML docs for v2.37.0-38-g55ece
Diffstat (limited to 'git-diff-index.txt')
| -rw-r--r-- | git-diff-index.txt | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/git-diff-index.txt b/git-diff-index.txt index 679cae27d..c30d8f0da 100644 --- a/git-diff-index.txt +++ b/git-diff-index.txt @@ -69,8 +69,8 @@ done an `update-index` to make that effective in the index file. matches my working directory. But doing a 'git diff-index' does: torvalds@ppc970:~/git> git diff-index --cached HEAD - -100644 blob 4161aecc6700a2eb579e842af0b7f22b98443f74 commit.c - +100644 blob 4161aecc6700a2eb579e842af0b7f22b98443f74 git-commit.c + :100644 000000 4161aecc6700a2eb579e842af0b7f22b98443f74 0000000000000000000000000000000000000000 D commit.c + :000000 100644 0000000000000000000000000000000000000000 4161aecc6700a2eb579e842af0b7f22b98443f74 A git-commit.c You can see easily that the above is a rename. @@ -103,7 +103,7 @@ have not actually done a 'git update-index' on it yet - there is no "object" associated with the new state, and you get: torvalds@ppc970:~/v2.6/linux> git diff-index --abbrev HEAD - :100644 100664 7476bb... 000000... kernel/sched.c + :100644 100644 7476bb5ba 000000000 M kernel/sched.c i.e., it shows that the tree has changed, and that `kernel/sched.c` is not up to date and may contain new stuff. The all-zero sha1 means that to |