diff options
| author | Junio C Hamano <gitster@pobox.com> | 2022-07-11 15:38:49 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2022-07-11 15:38:49 -0700 |
| commit | 2c8c0b48434c3ff31cfee254d306e6a42dfa2463 (patch) | |
| tree | eadbee8ccd4cc9896a0af2a75ae48f9be5689f41 /Documentation/diff-format.txt | |
| parent | 96730964f88b4c97ba0225aaad1d585d7fecc182 (diff) | |
| parent | 1971510c357507efe8baaac538a68b4aba78217e (diff) | |
| download | git-2c8c0b48434c3ff31cfee254d306e6a42dfa2463.tar.xz | |
Merge branch 'pb/diff-doc-raw-format'
Update "git diff/log --raw" format documentation.
* pb/diff-doc-raw-format:
diff-index.txt: update raw output format in examples
diff-format.txt: correct misleading wording
diff-format.txt: dst can be 0* SHA-1 when path is deleted, too
Diffstat (limited to 'Documentation/diff-format.txt')
| -rw-r--r-- | Documentation/diff-format.txt | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/Documentation/diff-format.txt b/Documentation/diff-format.txt index 7a9c3b6ff4..a3ae8747a2 100644 --- a/Documentation/diff-format.txt +++ b/Documentation/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: |