Skip to content
Snippets Groups Projects
Commit e4e5da27 authored by Stefan Beller's avatar Stefan Beller Committed by Junio C Hamano
Browse files

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: default avatarRoss Light <light@google.com>
Signed-off-by: default avatarStefan Beller <sbeller@google.com>
Signed-off-by: default avatarJunio C Hamano <gitster@pobox.com>
parent 27dea468
No related branches found
No related tags found
No related merge requests found
Loading
Loading
@@ -156,10 +156,10 @@ in which case `XY` are `!!`.
 
X Y Meaning
-------------------------------------------------
[MD] not updated
[AMD] not updated
M [ MD] updated in index
A [ MD] added to index
D [ M] deleted from index
D deleted from index
R [ MD] renamed in index
C [ MD] copied in index
[MARC] index and work tree matches
Loading
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment