summaryrefslogtreecommitdiff
path: root/Documentation
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2019-10-15 13:48:00 +0900
committerLibravatar Junio C Hamano <gitster@pobox.com>2019-10-15 13:48:00 +0900
commitd96e31e3902d615c03471c8566ce89872c3c1a4e (patch)
treeaade0139ba77e60f9c7f6445f2ac91225fca2e4d /Documentation
parentMerge branch 'en/merge-recursive-cleanup' (diff)
parentfetch: let --jobs=<n> parallelize --multiple, too (diff)
downloadtgif-d96e31e3902d615c03471c8566ce89872c3c1a4e.tar.xz
Merge branch 'js/fetch-jobs'
"git fetch --jobs=<n>" allowed <n> parallel jobs when fetching submodules, but this did not apply to "git fetch --multiple" that fetches from multiple remote repositories. It now does. * js/fetch-jobs: fetch: let --jobs=<n> parallelize --multiple, too
Diffstat (limited to 'Documentation')
-rw-r--r--Documentation/config/fetch.txt10
-rw-r--r--Documentation/fetch-options.txt13
2 files changed, 19 insertions, 4 deletions
diff --git a/Documentation/config/fetch.txt b/Documentation/config/fetch.txt
index e8cb20547c..f11940280f 100644
--- a/Documentation/config/fetch.txt
+++ b/Documentation/config/fetch.txt
@@ -70,6 +70,16 @@ fetch.showForcedUpdates::
linkgit:git-fetch[1] and linkgit:git-pull[1] commands.
Defaults to true.
+fetch.parallel::
+ Specifies the maximal number of fetch operations to be run in parallel
+ at a time (submodules, or remotes when the `--multiple` option of
+ linkgit:git-fetch[1] is in effect).
++
+A value of 0 will give some reasonable default. If unset, it defaults to 1.
++
+For submodules, this setting can be overridden using the `submodule.fetchJobs`
+config setting.
+
fetch.writeCommitGraph::
Set to true to write a commit-graph after every `git fetch` command
that downloads a pack-file from a remote. Using the `--split` option,
diff --git a/Documentation/fetch-options.txt b/Documentation/fetch-options.txt
index 99df1f3d4e..43b9ff3bce 100644
--- a/Documentation/fetch-options.txt
+++ b/Documentation/fetch-options.txt
@@ -160,10 +160,15 @@ ifndef::git-pull[]
-j::
--jobs=<n>::
- Number of parallel children to be used for fetching submodules.
- Each will fetch from different submodules, such that fetching many
- submodules will be faster. By default submodules will be fetched
- one at a time.
+ Number of parallel children to be used for all forms of fetching.
++
+If the `--multiple` option was specified, the different remotes will be fetched
+in parallel. If multiple submodules are fetched, they will be fetched in
+parallel. To control them independently, use the config settings
+`fetch.parallel` and `submodule.fetchJobs` (see linkgit:git-config[1]).
++
+Typically, parallel recursive and multi-remote fetches will be faster. By
+default fetches are performed sequentially, not in parallel.
--no-recurse-submodules::
Disable recursive fetching of submodules (this has the same effect as