summaryrefslogtreecommitdiff
path: root/Documentation
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2019-12-05 20:52:47 (GMT)
committerJunio C Hamano <gitster@pobox.com>2019-12-05 20:52:47 (GMT)
commit57d46bc602a6911946dc4ba7f4e79cd82cbc1e3e (patch)
tree916bb7e421500bf5fc65d075f92a784a4c37ac10 /Documentation
parent75bd003c7b8df862fd38f1e2cfb82b545d49a9e6 (diff)
parent8d483c840836ef2508741cf1592c285a2cba4552 (diff)
downloadgit-57d46bc602a6911946dc4ba7f4e79cd82cbc1e3e.zip
git-57d46bc602a6911946dc4ba7f4e79cd82cbc1e3e.tar.gz
git-57d46bc602a6911946dc4ba7f4e79cd82cbc1e3e.tar.bz2
Merge branch 'mg/doc-submodule-status-cached'
"git submodule status" and "git submodule status --cached" show different things, but the documentation did not cover them correctly, which has been corrected. * mg/doc-submodule-status-cached: doc: document 'git submodule status --cached'
Diffstat (limited to 'Documentation')
-rw-r--r--Documentation/git-submodule.txt3
1 files changed, 3 insertions, 0 deletions
diff --git a/Documentation/git-submodule.txt b/Documentation/git-submodule.txt
index 9de80a8..c3c5222 100644
--- a/Documentation/git-submodule.txt
+++ b/Documentation/git-submodule.txt
@@ -80,6 +80,9 @@ status [--cached] [--recursive] [--] [<path>...]::
does not match the SHA-1 found in the index of the containing
repository and `U` if the submodule has merge conflicts.
+
+If `--cached` is specified, this command will instead print the SHA-1
+recorded in the superproject for each submodule.
++
If `--recursive` is specified, this command will recurse into nested
submodules, and show their status as well.
+