summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2018-03-22 14:24:23 -0700
committerJunio C Hamano <gitster@pobox.com>2018-03-22 14:24:23 -0700
commite09224812aeb883fec4cd1c05dbcc173d593ccb7 (patch)
tree494251e40637fc6210e1f1f672b7d5a198d3ccc0
parent9ea8e0ca81e4aa9db312185f26b3cdcd4602e904 (diff)
parente4e5da2796846d8358273c7aa9ad3158593c2e62 (diff)
downloadgit-e09224812aeb883fec4cd1c05dbcc173d593ccb7.tar.gz
Merge branch 'sb/status-doc-fix' into maint
Docfix. * sb/status-doc-fix: Documentation/git-status: clarify status table for porcelain mode
-rw-r--r--Documentation/git-status.txt4
1 files changed, 2 insertions, 2 deletions
diff --git a/Documentation/git-status.txt b/Documentation/git-status.txt
index 72bfb87f66..f9c91c721e 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