diff options
author | Junio C Hamano <junio@hera.kernel.org> | 2008-11-03 04:36:58 +0000 |
---|---|---|
committer | Junio C Hamano <junio@hera.kernel.org> | 2008-11-03 04:36:58 +0000 |
commit | aa17c7c4d33a68aa8f51a1cea8f2ca37bdf86d26 (patch) | |
tree | a74c0772fb185c556c527d188f08ebbe3f45ac0b /diff-format.txt | |
parent | f7e47eefae93a126e7df9ca7ccf6ba2e3d1af914 (diff) | |
download | git-htmldocs-aa17c7c4d33a68aa8f51a1cea8f2ca37bdf86d26.tar.gz |
Autogenerated HTML docs for v1.6.0.3-613-g9f8f13
Diffstat (limited to 'diff-format.txt')
-rw-r--r-- | diff-format.txt | 16 |
1 files changed, 16 insertions, 0 deletions
diff --git a/diff-format.txt b/diff-format.txt index 400cbb3b1..aafd3a394 100644 --- a/diff-format.txt +++ b/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 M 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. |