X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=Documentation%2Fdiff-format.txt;h=1eeb1c76838c1911fc4d57b36a16dece0538809a;hb=72e3c32bef0574ec6febc5e815b0467f892ef7e2;hp=400cbb3b1c120b93278472678ee7bdb87a74f95b;hpb=c7ea453618e41e05a06f05e3ab63d555d0ddd7d9;p=git.git

diff --git a/Documentation/diff-format.txt b/Documentation/diff-format.txt
index 400cbb3b1..1eeb1c768 100644
--- a/Documentation/diff-format.txt
+++ b/Documentation/diff-format.txt
@@ -46,6 +46,22 @@ That is, from the left to the right:
 . path for "dst"; only exists for C or R.
 . an LF or a NUL when '-z' option is used, to terminate the record.
 
+Possible status letters are:
+
+- A: addition of a file
+- C: copy of a file into a new one
+- D: deletion of a file
+- M: modification of the contents or mode of a file
+- R: renaming of a file
+- T: change in the type of the file
+- U: file is unmerged (you must complete the merge before it can
+be committed)
+- X: "unknown" change type (most probably a bug, please report it)
+
+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.
+
 <sha1> is shown as all 0's if a file is new on the filesystem
 and it is out of sync with the index.