[PATCH 1/1] Documentation/git-status: clarify status table for porcelain mode
- From
Stefan Beller <sbeller@google.com>
- Date
- Feb 15, 2018, 00:18 UTC
- Message-ID
- <20180215001812.135304-2-sbeller@google.com>
- In-Reply-To
- <20180215001812.135304-1-sbeller@google.com>
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