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 /diff-format.txt | |
| parent | ebdf143ff06ab8a67139c290755d6c6ecfe3126b (diff) | |
| download | git-htmldocs-7bc735932830b9840daeff68819d626c3b0cd07b.tar.gz | |
Autogenerated HTML docs for v2.37.0-38-g55ece
Diffstat (limited to 'diff-format.txt')
| -rw-r--r-- | diff-format.txt | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/diff-format.txt b/diff-format.txt index 7a9c3b6ff..a3ae8747a 100644 --- a/diff-format.txt +++ b/diff-format.txt @@ -43,7 +43,7 @@ That is, from the left to the right: . a space. . sha1 for "src"; 0\{40\} if creation or unmerged. . a space. -. sha1 for "dst"; 0\{40\} if creation, unmerged or "look at work tree". +. sha1 for "dst"; 0\{40\} if deletion, unmerged or "work tree out of sync with the index". . a space. . status, followed by optional "score" number. . 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 copy). Status letter M may be followed by a score (denoting the percentage of dissimilarity) for file rewrites. -<sha1> is shown as all 0's if a file is new on the filesystem -and it is out of sync with the index. +The sha1 for "dst" is shown as all 0's if a file on the filesystem +is out of sync with the index. Example: |