summaryrefslogtreecommitdiff
path: root/Documentation
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2019-12-05 12:52:45 -0800
committerJunio C Hamano <gitster@pobox.com>2019-12-05 12:52:45 -0800
commitef6104581d9bfbe74ef99b52a72e436486001ead (patch)
tree234a3bc788fabec5b906113150a67d36df85ae50 /Documentation
parent7fd7a8ab29af952c8f6097ce8f22203a9d28d61a (diff)
parentf0e58b3fe85970cfac20cd10545dd91a65094887 (diff)
downloadgit-ef6104581d9bfbe74ef99b52a72e436486001ead.tar.gz
Merge branch 'pb/submodule-update-fetches'
Doc update. * pb/submodule-update-fetches: doc: mention that 'git submodule update' fetches missing commits
Diffstat (limited to 'Documentation')
-rw-r--r--Documentation/git-submodule.txt3
1 files changed, 2 insertions, 1 deletions
diff --git a/Documentation/git-submodule.txt b/Documentation/git-submodule.txt
index 1f46380af2..9de80a8252 100644
--- a/Documentation/git-submodule.txt
+++ b/Documentation/git-submodule.txt
@@ -133,7 +133,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