summaryrefslogtreecommitdiffstats
path: root/git-status.html
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2021-10-14 10:11:58 -0700
committerJunio C Hamano <gitster@pobox.com>2021-10-14 10:11:58 -0700
commit7b1585b6902973456b47ee9acd8a01365e52a4df (patch)
treedb6fefbd5686265cb8e111e44cda82b6bde4df27 /git-status.html
parent7c7cb3360bfca12cec5fa485344d786c4252d247 (diff)
downloadgit-htmldocs-7b1585b6902973456b47ee9acd8a01365e52a4df.tar.gz
Autogenerated HTML docs for v2.33.1-637-gf443b
Diffstat (limited to 'git-status.html')
-rw-r--r--git-status.html29
1 files changed, 18 insertions, 11 deletions
diff --git a/git-status.html b/git-status.html
index af7027460..ab52fc4bd 100644
--- a/git-status.html
+++ b/git-status.html
@@ -1083,6 +1083,11 @@ show tracked paths:</p></div>
</li>
<li>
<p>
+<em>T</em> = file type changed (regular file, symbolic link or submodule)
+</p>
+</li>
+<li>
+<p>
<em>A</em> = added
</p>
</li>
@@ -1098,7 +1103,7 @@ show tracked paths:</p></div>
</li>
<li>
<p>
-<em>C</em> = copied
+<em>C</em> = copied (if config option status.renames is set to "copies")
</p>
</li>
<li>
@@ -1112,16 +1117,18 @@ show tracked paths:</p></div>
<pre><code>X Y Meaning
-------------------------------------------------
[AMD] not updated
-M [ MD] updated in index
-A [ MD] added to index
+M [ MTD] updated in index
+T [ MTD] type changed in index
+A [ MTD] added to index
D deleted from index
-R [ MD] renamed in index
-C [ MD] copied in index
-[MARC] index and work tree matches
-[ MARC] M work tree changed since index
-[ MARC] D deleted in work tree
-[ D] R renamed in work tree
-[ D] C copied in work tree
+R [ MTD] renamed in index
+C [ MTD] copied in index
+[MTARC] index and work tree matches
+[ MTARC] M work tree changed since index
+[ MTARC] T type changed in work tree since index
+[ MTARC] D deleted in work tree
+ R renamed in work tree
+ C copied in work tree
-------------------------------------------------
D D unmerged, both deleted
A U unmerged, added by us
@@ -1361,7 +1368,7 @@ using <code>git --no-optional-locks status</code> (see <a href="git.html">git(1)
<div id="footer">
<div id="footer-text">
Last updated
- 2021-10-06 14:16:38 PDT
+ 2021-10-14 10:10:01 PDT
</div>
</div>
</body>