File tree Expand file tree Collapse file tree 2 files changed +6
-6
lines changed Expand file tree Collapse file tree 2 files changed +6
-6
lines changed Original file line number Diff line number Diff line change @@ -43,7 +43,7 @@ That is, from the left to the right:
43
43
. a space.
44
44
. sha1 for "src"; 0\{40\} if creation or unmerged.
45
45
. a space.
46
- . sha1 for "dst"; 0\{40\} if creation , unmerged or "look at work tree".
46
+ . sha1 for "dst"; 0\{40\} if deletion , unmerged or "work tree out of sync with the index ".
47
47
. a space.
48
48
. status, followed by optional "score" number.
49
49
. a tab or a NUL when `-z` option is used.
@@ -69,8 +69,8 @@ percentage of similarity between the source and target of the move or
69
69
copy). Status letter M may be followed by a score (denoting the
70
70
percentage of dissimilarity) for file rewrites.
71
71
72
- < sha1> is shown as all 0's if a file is new on the filesystem
73
- and it is out of sync with the index.
72
+ The sha1 for "dst" is shown as all 0's if a file on the filesystem
73
+ is out of sync with the index.
74
74
75
75
Example:
76
76
Original file line number Diff line number Diff line change @@ -69,8 +69,8 @@ done an `update-index` to make that effective in the index file.
69
69
matches my working directory. But doing a 'git diff-index' does:
70
70
71
71
torvalds@ppc970:~/git> git diff-index --cached HEAD
72
- - 100644 blob 4161aecc6700a2eb579e842af0b7f22b98443f74 commit.c
73
- + 100644 blob 4161aecc6700a2eb579e842af0b7f22b98443f74 git-commit.c
72
+ : 100644 000000 4161aecc6700a2eb579e842af0b7f22b98443f74 0000000000000000000000000000000000000000 D commit.c
73
+ :000000 100644 0000000000000000000000000000000000000000 4161aecc6700a2eb579e842af0b7f22b98443f74 A git-commit.c
74
74
75
75
You can see easily that the above is a rename.
76
76
@@ -103,7 +103,7 @@ have not actually done a 'git update-index' on it yet - there is no
103
103
"object" associated with the new state, and you get:
104
104
105
105
torvalds@ppc970:~/v2.6/linux> git diff-index --abbrev HEAD
106
- :100644 100664 7476bb... 000000... kernel/sched.c
106
+ :100644 100644 7476bb5ba 000000000 M kernel/sched.c
107
107
108
108
i.e., it shows that the tree has changed, and that `kernel/sched.c` is
109
109
not up to date and may contain new stuff. The all-zero sha1 means that to
You can’t perform that action at this time.
0 commit comments