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 <light@google.com> Signed-off-by: Stefan Beller <sbeller@google.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>

Stefan Beller committed Feb 14, 2018 at 16:18 UTC e4e5da2796846d8358273c7aa9ad3158593c2e62
1 file changed +2 -2
Documentation/git-status.txt
+2 -2
@@ -156,10 +156,10 @@ in which case `XY` are `!!`.
156
157 X Y Meaning
158 -------------------------------------------------
159 - [MD] not updated
159 + [AMD] not updated
160 M [ MD] updated in index
161 A [ MD] added to index
162 - D [ M] deleted from index
162 + D deleted from index
163 R [ MD] renamed in index
164 C [ MD] copied in index
165 [MARC] index and work tree matches