{"thread":{"id":"47850","subject":"[PATCH 0/1] git status docs.","startedAt":"2018-02-15T00:18:28Z","lastAt":"2018-02-15T19:07:30Z","messageCount":3,"participants":["Stefan Beller","Junio C Hamano"],"isPatch":true,"patchVersion":1,"patchTotal":1},"messages":[{"id":"339417","messageId":"20180215001812.135304-1-sbeller@google.com","threadId":"47850","inReplyTo":null,"subject":"[PATCH 0/1] git status docs.","fromName":"Stefan Beller","fromEmail":"sbeller@google.com","sentAt":"2018-02-15T00:18:11Z","receivedAt":"2018-02-15T00:18:28Z","isPatch":true,"sender":{"key":"stefanbeller@gmail.com","avatar":"https://avatars.githubusercontent.com/u/455868?v=4"},"body":"A user complained about the inaccurate documentation of `git-status --porcelain`.\nFix the table showing the states.\n\nI found e92e9cd3c3 (Documentation improvements for the description\nof short format., 2010-04-23) which also linked to \nhttps://public-inbox.org/git/20100410040959.GA11977@coredump.intra.peff.net/\n\nStefan Beller (1):\n  Documentation/git-status: clarify status table for porcelain mode\n\n Documentation/git-status.txt | 4 ++--\n 1 file changed, 2 insertions(+), 2 deletions(-)\n\n-- \n2.16.1.291.g4437f3f132-goog\n\n"},{"id":"339418","messageId":"20180215001812.135304-2-sbeller@google.com","threadId":"47850","inReplyTo":"20180215001812.135304-1-sbeller@google.com","subject":"[PATCH 1/1] Documentation/git-status: clarify status table for porcelain mode","fromName":"Stefan Beller","fromEmail":"sbeller@google.com","sentAt":"2018-02-15T00:18:12Z","receivedAt":"2018-02-15T00:18:33Z","isPatch":true,"sender":{"key":"stefanbeller@gmail.com","avatar":"https://avatars.githubusercontent.com/u/455868?v=4"},"body":"It is possible to have the output ' A' from 'git status --porcelain'\nby adding a file using the '--intend-to-add' flag.  Make this clear by\nadding the pattern in the table of the documentation.\n\nHowever the mode 'DM' (deleted in the index, modified in the working tree)\nis not possible in the non-merge case in which the file only shows\nas 'D ' (and adding it back to the worktree would show an additional line\nof an '??' untracked file). It is also not possible in the merge case as\nthen the mode involves a 'U' on one side of the merge.\nRemove that pattern.\n\nReported-by: Ross Light <light@google.com>\nSigned-off-by: Stefan Beller <sbeller@google.com>\n---\n Documentation/git-status.txt | 4 ++--\n 1 file changed, 2 insertions(+), 2 deletions(-)\n\ndiff --git a/Documentation/git-status.txt b/Documentation/git-status.txt\nindex 72bfb87f66..de69035cca 100644\n--- a/Documentation/git-status.txt\n+++ b/Documentation/git-status.txt\n@@ -184,10 +184,10 @@ in which case `XY` are `!!`.\n \n     X          Y     Meaning\n     -------------------------------------------------\n-              [MD]   not updated\n+             [AMD]   not updated\n     M        [ MD]   updated in index\n     A        [ MD]   added to index\n-    D         [ M]   deleted from index\n+    D                deleted from index\n     R        [ MD]   renamed in index\n     C        [ MD]   copied in index\n     [MARC]           index and work tree matches\n-- \n2.16.1.291.g4437f3f132-goog\n\n"},{"id":"339494","messageId":"xmqqzi4a842f.fsf@gitster-ct.c.googlers.com","threadId":"47850","inReplyTo":"20180215001812.135304-2-sbeller@google.com","subject":"Re: [PATCH 1/1] Documentation/git-status: clarify status table for porcelain mode","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2018-02-15T19:07:20Z","receivedAt":"2018-02-15T19:07:30Z","isPatch":true,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"Stefan Beller <sbeller@google.com> writes:\n\n> It is possible to have the output ' A' from 'git status --porcelain'\n> by adding a file using the '--intend-to-add' flag.  Make this clear by\n> adding the pattern in the table of the documentation.\n>\n> However the mode 'DM' (deleted in the index, modified in the working tree)\n> is not possible in the non-merge case in which the file only shows\n> as 'D ' (and adding it back to the worktree would show an additional line\n\nCorrect.  Thanks, will queue.\n"}]}