summaryrefslogtreecommitdiff
path: root/Documentation
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2015-02-24 22:10:36 -0800
committerLibravatar Junio C Hamano <gitster@pobox.com>2015-02-24 22:10:36 -0800
commit9f8410b941130630db288794c253e697e4515d9d (patch)
tree99bf6df9e31d7d191e61b4ae1c7361bc1899a688 /Documentation
parentMerge branch 'jk/remote-curl-an-array-in-struct-cannot-be-null' into maint (diff)
parentdiff-format doc: a score can follow M for rewrite (diff)
downloadtgif-9f8410b941130630db288794c253e697e4515d9d.tar.xz
Merge branch 'jc/diff-format-doc' into maint
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
Diffstat (limited to 'Documentation')
-rw-r--r--Documentation/diff-format.txt3
1 files changed, 2 insertions, 1 deletions
diff --git a/Documentation/diff-format.txt b/Documentation/diff-format.txt
index 15c7e794f4..85b08909ce 100644
--- a/Documentation/diff-format.txt
+++ b/Documentation/diff-format.txt
@@ -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.