[PATCH 0/1] git status docs.

[PATCH 0/1] git status docs.

[Stefan Beller]

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/20100410040959.GA11977@coredump.intra.peff.net/

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

 Documentation/git-status.txt | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

-- 
2.16.1.291.g4437f3f132-goog

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

[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
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>
---
 Documentation/git-status.txt | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Documentation/git-status.txt b/Documentation/git-status.txt
index 72bfb87f66..de69035cca 100644
--- a/Documentation/git-status.txt
+++ b/Documentation/git-status.txt
@@ -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
-- 
2.16.1.291.g4437f3f132-goog

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

[Junio C Hamano]

Stefan Beller <sbeller@google.com> writes:

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