diff options
| author | Stefan Beller <sbeller@google.com> | 2018-02-15 00:18:12 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2018-02-15 19:07:52 (GMT) |
| commit | e4e5da2796846d8358273c7aa9ad3158593c2e62 (patch) | |
| tree | ec54b75ba97393d1ad8d54800c62b8e6b5c83e90 /Documentation | |
| parent | 27dea4683b608c5c0487dee74cbda13b62803b73 (diff) | |
| download | git-e4e5da2796846d8358273c7aa9ad3158593c2e62.zip git-e4e5da2796846d8358273c7aa9ad3158593c2e62.tar.gz git-e4e5da2796846d8358273c7aa9ad3158593c2e62.tar.bz2 | |
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.
Reported-by: Ross Light <light@google.com>
Signed-off-by: Stefan Beller <sbeller@google.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/git-status.txt | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Documentation/git-status.txt b/Documentation/git-status.txt index e1e8f57..4cb1221 100644 --- a/Documentation/git-status.txt +++ b/Documentation/git-status.txt @@ -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 |