Skip to content

Commit 9875c51

Browse files
committed
Merge branch 'ja/doc-status-types-and-copies'
A few kinds of changes "git status" can show were not documented. * ja/doc-status-types-and-copies: Documentation/git-status: mention how to detect copies Documentation/git-status: document porcelain status T (typechange) Documentation/diff-format: state in which cases porcelain status is T Documentation/git-status: remove impossible porcelain status DR and DC
2 parents f0beebd + d2a534c commit 9875c51

File tree

2 files changed

+14
-11
lines changed

2 files changed

+14
-11
lines changed

Documentation/diff-format.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ Possible status letters are:
5959
- D: deletion of a file
6060
- M: modification of the contents or mode of a file
6161
- R: renaming of a file
62-
- T: change in the type of the file
62+
- T: change in the type of the file (regular file, symbolic link or submodule)
6363
- U: file is unmerged (you must complete the merge before it can
6464
be committed)
6565
- X: "unknown" change type (most probably a bug, please report it)

Documentation/git-status.txt

Lines changed: 13 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -207,26 +207,29 @@ show tracked paths:
207207

208208
* ' ' = unmodified
209209
* 'M' = modified
210+
* 'T' = file type changed (regular file, symbolic link or submodule)
210211
* 'A' = added
211212
* 'D' = deleted
212213
* 'R' = renamed
213-
* 'C' = copied
214+
* 'C' = copied (if config option status.renames is set to "copies")
214215
* 'U' = updated but unmerged
215216

216217
....
217218
X Y Meaning
218219
-------------------------------------------------
219220
[AMD] not updated
220-
M [ MD] updated in index
221-
A [ MD] added to index
221+
M [ MTD] updated in index
222+
T [ MTD] type changed in index
223+
A [ MTD] added to index
222224
D deleted from index
223-
R [ MD] renamed in index
224-
C [ MD] copied in index
225-
[MARC] index and work tree matches
226-
[ MARC] M work tree changed since index
227-
[ MARC] D deleted in work tree
228-
[ D] R renamed in work tree
229-
[ D] C copied in work tree
225+
R [ MTD] renamed in index
226+
C [ MTD] copied in index
227+
[MTARC] index and work tree matches
228+
[ MTARC] M work tree changed since index
229+
[ MTARC] T type changed in work tree since index
230+
[ MTARC] D deleted in work tree
231+
R renamed in work tree
232+
C copied in work tree
230233
-------------------------------------------------
231234
D D unmerged, both deleted
232235
A U unmerged, added by us

0 commit comments

Comments
 (0)