development/git
development/git
1
0
Fork 0
mirror of https://github.com/git/git synced 2024-08-25 02:35:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

Documentation/git-status: clarify status table for porcelain mode

Browse source 
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>
This commit is contained in:
Stefan Beller 2018-02-14 16:18:12 -08:00 committed by Junio C Hamano
parent 27dea4683b
commit e4e5da2796
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
Documentation/git-status.txt
View file

@ -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