Skip to content

Commit e4e5da2

Browse files
stefanbellergitster
authored andcommitted
Documentation/git-status: clarify status table for porcelain mode
It is possible to have the output ' A' from 'git status --porcelain' by adding a file using the '--intend-to-add' flag. Make this clear by adding the pattern in the table of the documentation. However the mode 'DM' (deleted in the index, modified in the working tree) is not possible in the non-merge case in which the file only shows as 'D ' (and adding it back to the worktree would show an additional line of an '??' untracked file). It is also not possible in the merge case as then the mode involves a 'U' on one side of the merge. Remove that pattern. Reported-by: Ross Light <[email protected]> Signed-off-by: Stefan Beller <[email protected]> Signed-off-by: Junio C Hamano <[email protected]>
1 parent 27dea46 commit e4e5da2

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

Documentation/git-status.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -156,10 +156,10 @@ in which case `XY` are `!!`.
156156

157157
X Y Meaning
158158
-------------------------------------------------
159-
[MD] not updated
159+
[AMD] not updated
160160
M [ MD] updated in index
161161
A [ MD] added to index
162-
D [ M] deleted from index
162+
D deleted from index
163163
R [ MD] renamed in index
164164
C [ MD] copied in index
165165
[MARC] index and work tree matches

0 commit comments

Comments
 (0)