Skip to content

Commit

Permalink
Merge branch 'jc/diff-format-doc' into maint
Browse files Browse the repository at this point in the history
The documentation incorrectly said that C(opy) and R(ename) are the
only ones that can be followed by the score number in the output in
the --raw format.

* jc/diff-format-doc:
  diff-format doc: a score can follow M for rewrite
  • Loading branch information
Junio C Hamano committed Feb 25, 2015
2 parents b9efce1 + ac1c2d9 commit 9f8410b
Showing 1 changed file with 2 additions and 1 deletion.
3 changes: 2 additions & 1 deletion Documentation/diff-format.txt
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,8 @@ be committed)

Status letters C and R are always followed by a score (denoting the
percentage of similarity between the source and target of the move or
copy), and are the only ones to be so.
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.
Expand Down

0 comments on commit 9f8410b

Please sign in to comment.