about summary refs log tree commit diff
path: root/third_party/git/Documentation/fetch-options.txt
diff options
context:
space:
mode:
authorVincent Ambo <tazjin@google.com>2020-05-25T23·06+0100
committerVincent Ambo <tazjin@google.com>2020-05-25T23·06+0100
commit93ba78d6f4632ef1c5228965e3edc8c0faf88c1e (patch)
tree85730c182a9f5f492ade8e8ccdb1c2356f9900bd /third_party/git/Documentation/fetch-options.txt
parent6f8fbf4aa4b1654ab27d4829e114538761817de0 (diff)
revert(3p/git): Revert merge of git upstream at v2.26.2 r/852
This causes cgit to serve error pages, which is undesirable.

This reverts commit 5229c9b232de5bfa959ad6ebbb4c8192ac513352, reversing
changes made to f2b211131f2347342dde63975b09cf603149f1a3.
Diffstat (limited to 'third_party/git/Documentation/fetch-options.txt')
-rw-r--r--third_party/git/Documentation/fetch-options.txt29
1 files changed, 5 insertions, 24 deletions
diff --git a/third_party/git/Documentation/fetch-options.txt b/third_party/git/Documentation/fetch-options.txt
index a115a1ae0e97..3c9b4f9e0951 100644
--- a/third_party/git/Documentation/fetch-options.txt
+++ b/third_party/git/Documentation/fetch-options.txt
@@ -92,10 +92,6 @@ ifndef::git-pull[]
 	Run `git gc --auto` at the end to perform garbage collection
 	if needed. This is enabled by default.
 
---[no-]write-commit-graph::
-	Write a commit-graph after fetching. This overrides the config
-	setting `fetch.writeCommitGraph`.
-
 -p::
 --prune::
 	Before fetching, remove any remote-tracking references that no
@@ -139,10 +135,7 @@ ifndef::git-pull[]
 	specified refspec (can be given more than once) to map the
 	refs to remote-tracking branches, instead of the values of
 	`remote.*.fetch` configuration variables for the remote
-	repository.  Providing an empty `<refspec>` to the
-	`--refmap` option causes Git to ignore the configured
-	refspecs and rely entirely on the refspecs supplied as
-	command-line arguments. See section on "Configured Remote-tracking
+	repository.  See section on "Configured Remote-tracking
 	Branches" for details.
 
 -t::
@@ -167,27 +160,15 @@ ifndef::git-pull[]
 
 -j::
 --jobs=<n>::
-	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.
+	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.
 
 --no-recurse-submodules::
 	Disable recursive fetching of submodules (this has the same effect as
 	using the `--recurse-submodules=no` option).
 
---set-upstream::
-	If the remote is fetched successfully, pull and add upstream
-	(tracking) reference, used by argument-less
-	linkgit:git-pull[1] and other commands. For more information,
-	see `branch.<name>.merge` and `branch.<name>.remote` in
-	linkgit:git-config[1].
-
 --submodule-prefix=<path>::
 	Prepend <path> to paths printed in informative messages
 	such as "Fetching submodule foo".  This option is used