зеркало из https://github.com/microsoft/git.git
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:
Коммит
9875c51553
|
@ -59,7 +59,7 @@ Possible status letters are:
|
||||||
- D: deletion of a file
|
- D: deletion of a file
|
||||||
- M: modification of the contents or mode of a file
|
- M: modification of the contents or mode of a file
|
||||||
- R: renaming 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
|
- U: file is unmerged (you must complete the merge before it can
|
||||||
be committed)
|
be committed)
|
||||||
- X: "unknown" change type (most probably a bug, please report it)
|
- X: "unknown" change type (most probably a bug, please report it)
|
||||||
|
|
|
@ -207,26 +207,29 @@ show tracked paths:
|
||||||
|
|
||||||
* ' ' = unmodified
|
* ' ' = unmodified
|
||||||
* 'M' = modified
|
* 'M' = modified
|
||||||
|
* 'T' = file type changed (regular file, symbolic link or submodule)
|
||||||
* 'A' = added
|
* 'A' = added
|
||||||
* 'D' = deleted
|
* 'D' = deleted
|
||||||
* 'R' = renamed
|
* 'R' = renamed
|
||||||
* 'C' = copied
|
* 'C' = copied (if config option status.renames is set to "copies")
|
||||||
* 'U' = updated but unmerged
|
* 'U' = updated but unmerged
|
||||||
|
|
||||||
....
|
....
|
||||||
X Y Meaning
|
X Y Meaning
|
||||||
-------------------------------------------------
|
-------------------------------------------------
|
||||||
[AMD] not updated
|
[AMD] not updated
|
||||||
M [ MD] updated in index
|
M [ MTD] updated in index
|
||||||
A [ MD] added to index
|
T [ MTD] type changed in index
|
||||||
|
A [ MTD] added to index
|
||||||
D deleted from index
|
D deleted from index
|
||||||
R [ MD] renamed in index
|
R [ MTD] renamed in index
|
||||||
C [ MD] copied in index
|
C [ MTD] copied in index
|
||||||
[MARC] index and work tree matches
|
[MTARC] index and work tree matches
|
||||||
[ MARC] M work tree changed since index
|
[ MTARC] M work tree changed since index
|
||||||
[ MARC] D deleted in work tree
|
[ MTARC] T type changed in work tree since index
|
||||||
[ D] R renamed in work tree
|
[ MTARC] D deleted in work tree
|
||||||
[ D] C copied in work tree
|
R renamed in work tree
|
||||||
|
C copied in work tree
|
||||||
-------------------------------------------------
|
-------------------------------------------------
|
||||||
D D unmerged, both deleted
|
D D unmerged, both deleted
|
||||||
A U unmerged, added by us
|
A U unmerged, added by us
|
||||||
|
|
Загрузка…
Ссылка в новой задаче