summaryrefslogtreecommitdiff
path: root/Documentation/manpage-base.xsl
diff options
context:
space:
mode:
authorLibravatar Stefan Beller <sbeller@google.com>2018-02-14 16:18:12 -0800
committerLibravatar Junio C Hamano <gitster@pobox.com>2018-02-15 11:07:52 -0800
commite4e5da2796846d8358273c7aa9ad3158593c2e62 (patch)
treeec54b75ba97393d1ad8d54800c62b8e6b5c83e90 /Documentation/manpage-base.xsl
parentGit 2.10.5 (diff)
downloadtgif-e4e5da2796846d8358273c7aa9ad3158593c2e62.tar.xz
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/manpage-base.xsl')
0 files changed, 0 insertions, 0 deletions