diff options
author | Junio C Hamano <gitster@pobox.com> | 2008-11-03 00:36:40 (GMT) |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2008-11-03 00:36:40 (GMT) |
commit | 84cdd3c635280c42ae42009c4be020ef2c30ba7c (patch) | |
tree | 773c977169a5085ff4a8dfb2dab300503d9ff05b /Documentation/diff-format.txt | |
parent | 275ee50c819d6c25a303f3d01689aba00840a783 (diff) | |
parent | a5a323f33cd25829e0dde3939b196cf743d7d9d8 (diff) | |
download | git-84cdd3c635280c42ae42009c4be020ef2c30ba7c.zip git-84cdd3c635280c42ae42009c4be020ef2c30ba7c.tar.gz git-84cdd3c635280c42ae42009c4be020ef2c30ba7c.tar.bz2 |
Merge branch 'maint'
* maint:
Add reference for status letters in documentation.
Document that git-log takes --all-match.
Update draft 1.6.0.4 release notes
Diffstat (limited to 'Documentation/diff-format.txt')
-rw-r--r-- | Documentation/diff-format.txt | 16 |
1 files changed, 16 insertions, 0 deletions
diff --git a/Documentation/diff-format.txt b/Documentation/diff-format.txt index 400cbb3..aafd3a3 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 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. |