X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=Documentation%2Fdiff-format.txt;h=d6ce035419081e3fbfc2375ac667517f5f52c980;hb=44ab20cd884dcb3d2ef4cfbda4591dd2cd9bee79;hp=6748761ef61cf35473ee304bc8bd44134cdccaf4;hpb=1a93a7662d6f8c3a4f48cb9468eb494ec823f2a5;p=git.git diff --git a/Documentation/diff-format.txt b/Documentation/diff-format.txt index 6748761e..d6ce0354 100644 --- a/Documentation/diff-format.txt +++ b/Documentation/diff-format.txt @@ -36,12 +36,13 @@ That is, from the left to the right: (6) sha1 for "src"; 0{40} if creation or unmerged. (7) a space. (8) sha1 for "dst"; 0{40} if creation, unmerged or "look at work tree". - (9) status, followed by optional "score" number. - (10) a tab or a NUL when '-z' option is used. - (11) path for "src" - (12) a tab or a NUL when '-z' option is used; only exists for C or R. - (13) path for "dst"; only exists for C or R. - (14) an LF or a NUL when '-z' option is used, to terminate the record. + (9) a space. + (10) status, followed by optional "score" number. + (11) a tab or a NUL when '-z' option is used. + (12) path for "src" + (13) a tab or a NUL when '-z' option is used; only exists for C or R. + (14) path for "dst"; only exists for C or R. + (15) an LF or a NUL when '-z' option is used, to terminate the record. is shown as all 0's if new is a file on the filesystem and it is out of sync with the cache. Example: