Skip to contentSkip to conversation

git status docs.

PATCH In review Stefan Beller 2 participants 3 messages Feb 15, 2018 Documentation

lore
Share & tools
lore
#0 lore raw

cover git status docs.

A user complained about the inaccurate documentation of git-status --porcelain. Fix the table showing the states.

I found e92e9cd3c3 (Documentation improvements for the description of short format., 2010-04-23) which also linked to
https://public-inbox.org/git/[email protected]/

Stefan Beller (1):
Documentation/git-status: clarify status table for porcelain mode

 Documentation/git-status.txt | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
Signature · 1 line
2.16.1.291.g4437f3f132-goog
#1 lore raw

PATCH 1/1 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.

---
 Documentation/git-status.txt | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
Documentation/git-status.txt +2 -2
index 72bfb87f66..de69035cca 100644
@@ -184,10 +184,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
Signature · 1 line
2.16.1.291.g4437f3f132-goog
#2 lore raw

Re: [PATCH 1/1] Documentation/git-status: clarify status table for porcelain mode

Quoted 7 lines · Stefan Beller

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

Correct. Thanks, will queue.