summaryrefslogtreecommitdiffstats
path: root/git-submodule.txt
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2019-12-05 14:22:00 -0800
committerJunio C Hamano <gitster@pobox.com>2019-12-05 14:22:00 -0800
commitb3f862c5e7e19d0ae8abc32492356ff7d1578110 (patch)
tree95b41daba023b1705d5ec5b8d4db399c8cbc3f9d /git-submodule.txt
parent8ef91f31f6606a0370b18943c3b0f089e04873f9 (diff)
downloadgit-htmldocs-b3f862c5e7e19d0ae8abc32492356ff7d1578110.tar.gz
Autogenerated HTML docs for v2.24.0-390-g083378
Diffstat (limited to 'git-submodule.txt')
-rw-r--r--git-submodule.txt6
1 files changed, 5 insertions, 1 deletions
diff --git a/git-submodule.txt b/git-submodule.txt
index 1f46380af..c3c52225a 100644
--- a/git-submodule.txt
+++ b/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.
+
@@ -133,7 +136,8 @@ update [--init] [--remote] [-N|--no-fetch] [--[no-]recommend-shallow] [-f|--forc
+
--
Update the registered submodules to match what the superproject
-expects by cloning missing submodules and updating the working tree of
+expects by cloning missing submodules, fetching missing commits
+in submodules and updating the working tree of
the submodules. The "updating" can be done in several ways depending
on command line options and the value of `submodule.<name>.update`
configuration variable. The command line option takes precedence over