Skip to content

Commit ac1c2d9

Browse files
committed
diff-format doc: a score can follow M for rewrite
b6d8f30 (diff-raw format update take #2., 2005-05-23) started documenting the diff format, and it said ... (8) sha1 for "dst"; 0{40} if creation, unmerged or "look at work tree". (9) status, followed by similarlity index number only for C and R. (10) a tab or a NUL when '-z' option is used. ... because C and R _were_ the only ones that came with a number back then. This was corrected by ddafa7e (diff-helper: Fix R/C score parsing under -z flag., 2005-05-29) and we started saying "score" instead of "similarlity index" (because we can have other kind of score there), and stopped saying "only for C and R" (because Git is an ever evolving system). Later f345b0a (Add -B flag to diff-* brothers., 2005-05-30) introduced a new concept, "dissimilarity" score; it did not have to fix any documentation. The current text that says only C and R can have scores came independently from a5a323f (Add reference for status letters in documentation., 2008-11-02) and it was wrong from the day one. Noticed-by: Mike Hommey Signed-off-by: Junio C Hamano <[email protected]>
1 parent 3d8a54e commit ac1c2d9

File tree

1 file changed

+2
-1
lines changed

1 file changed

+2
-1
lines changed

Documentation/diff-format.txt

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,8 @@ be committed)
6666

6767
Status letters C and R are always followed by a score (denoting the
6868
percentage of similarity between the source and target of the move or
69-
copy), and are the only ones to be so.
69+
copy). Status letter M may be followed by a score (denoting the
70+
percentage of dissimilarity) for file rewrites.
7071

7172
<sha1> is shown as all 0's if a file is new on the filesystem
7273
and it is out of sync with the index.

0 commit comments

Comments
 (0)