summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2019-12-05 12:52:47 -0800
committerLibravatar Junio C Hamano <gitster@pobox.com>2019-12-05 12:52:47 -0800
commit57d46bc602a6911946dc4ba7f4e79cd82cbc1e3e (patch)
tree916bb7e421500bf5fc65d075f92a784a4c37ac10
parentMerge branch 'js/git-svn-use-rebase-merges' (diff)
parentdoc: document 'git submodule status --cached' (diff)
downloadtgif-57d46bc602a6911946dc4ba7f4e79cd82cbc1e3e.tar.xz
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'
-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 9de80a8252..c3c52225af 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.
+