mirror of
https://github.com/git/git
synced 2024-08-25 02:35:46 +00:00
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
This commit is contained in:
commit
9875c51553
|
@ -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)
|
||||
|
|
|
@ -207,26 +207,29 @@ show tracked paths:
|
|||
|
||||
* ' ' = unmodified
|
||||
* 'M' = modified
|
||||
* 'T' = file type changed (regular file, symbolic link or submodule)
|
||||
* 'A' = added
|
||||
* 'D' = deleted
|
||||
* 'R' = renamed
|
||||
* 'C' = copied
|
||||
* 'C' = copied (if config option status.renames is set to "copies")
|
||||
* 'U' = updated but unmerged
|
||||
|
||||
....
|
||||
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
|
||||
|
|
Loading…
Reference in a new issue