From: Christian Meder Date: Thu, 2 Jun 2005 09:55:03 +0000 (+0200) Subject: [PATCH] Miniscule correction of diff-format.txt X-Git-Tag: v0.99~308 X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=1ae4ee8942903ebb978c0980a34182bc4b60240e;p=git.git [PATCH] Miniscule correction of diff-format.txt Add missing "space" element to the description of the diff-format. Signed-off-by: Christian Meder Acked-by: Petr Baudis Signed-off-by: Linus Torvalds --- diff --git a/Documentation/diff-format.txt b/Documentation/diff-format.txt index 6748761ef..d6ce03541 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: