summaryrefslogtreecommitdiff
path: root/Documentation/diff-format.txt
diff options
context:
space:
mode:
authorJohannes Altmanninger <aclopte@gmail.com>2021-10-04 19:00:48 (GMT)
committerJunio C Hamano <gitster@pobox.com>2021-10-04 20:07:18 (GMT)
commit55e7f52b407dffc8aead377bff2ca3356dfde3e6 (patch)
tree1ce756c20f5513b59ef4b43cc74126c00e1f0afa /Documentation/diff-format.txt
parent1566cdd4aea973592ef1871197bc3d6b74b42d7e (diff)
downloadgit-55e7f52b407dffc8aead377bff2ca3356dfde3e6.zip
git-55e7f52b407dffc8aead377bff2ca3356dfde3e6.tar.gz
git-55e7f52b407dffc8aead377bff2ca3356dfde3e6.tar.bz2
Documentation/diff-format: state in which cases porcelain status is T
Porcelain status letter T is documented as "type of the file", which is technically correct but not enough information for users that are not so familiar with this term from systems programming. In particular, given that the only supported file types are "regular file", "symbolic link" and "submodule", the term "file type" is surely opaque to the many(?) users who are not aware that symbolic links can be tracked - I thought that a "chmod +x" could cause the T status (wrong, it's M). Explicitly document the three file types so users know if/how they want to handle this. Signed-off-by: Johannes Altmanninger <aclopte@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation/diff-format.txt')
-rw-r--r--Documentation/diff-format.txt2
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/diff-format.txt b/Documentation/diff-format.txt
index fbbd410..7a9c3b6 100644
--- a/Documentation/diff-format.txt
+++ b/Documentation/diff-format.txt
@@ -59,7 +59,7 @@ Possible status letters are:
- 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
+- T: change in the type of the file (regular file, symbolic link or submodule)
- 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)