summaryrefslogtreecommitdiff
path: root/Documentation/fetch-options.txt
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2010-12-16 12:57:15 -0800
committerJunio C Hamano <gitster@pobox.com>2010-12-16 12:57:15 -0800
commit4bb4d30095fbc3b1689cc656e71f6a51e43fbd69 (patch)
tree2865af7e033d5aee40cb589fe8ad8bdfa6d8b143 /Documentation/fetch-options.txt
parentb5c6aac01baf9164e08915b348490710e83119f9 (diff)
parent1c1f3537c0283c92abbca9155813ed62b05cb481 (diff)
downloadgit-4bb4d30095fbc3b1689cc656e71f6a51e43fbd69.tar.gz
Merge branch 'jl/fetch-submodule-recursive'
* jl/fetch-submodule-recursive: fetch_populated_submodules(): document dynamic allocation Submodules: Add the "fetchRecurseSubmodules" config option Add the 'fetch.recurseSubmodules' config setting fetch/pull: Add the --recurse-submodules option Conflicts: builtin/fetch.c
Diffstat (limited to 'Documentation/fetch-options.txt')
-rw-r--r--Documentation/fetch-options.txt11
1 files changed, 11 insertions, 0 deletions
diff --git a/Documentation/fetch-options.txt b/Documentation/fetch-options.txt
index 678675ccdf..695696da1b 100644
--- a/Documentation/fetch-options.txt
+++ b/Documentation/fetch-options.txt
@@ -66,6 +66,17 @@ ifndef::git-pull[]
linkgit:git-config[1].
endif::git-pull[]
+--[no-]recurse-submodules::
+ This option controls if new commits of all populated submodules should
+ be fetched too (see linkgit:git-config[1] and linkgit:gitmodules[5]).
+
+ifndef::git-pull[]
+--submodule-prefix=<path>::
+ Prepend <path> to paths printed in informative messages
+ such as "Fetching submodule foo". This option is used
+ internally when recursing over submodules.
+endif::git-pull[]
+
-u::
--update-head-ok::
By default 'git fetch' refuses to update the head which