Skip to content

Commit f08dab7

Browse files
committed
Merge branch 'rs/doc-passthru-fetch-options' into next
Doc update. * rs/doc-passthru-fetch-options: pull: document more passthru options
2 parents 059072f + 9c68873 commit f08dab7

File tree

1 file changed

+7
-3
lines changed

1 file changed

+7
-3
lines changed

Documentation/fetch-options.txt

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -61,10 +61,8 @@ this option multiple times, one for each matching ref name.
6161
See also the `fetch.negotiationAlgorithm` configuration variable
6262
documented in linkgit:git-config[1].
6363

64-
ifndef::git-pull[]
6564
--dry-run::
6665
Show what would be done, without making any changes.
67-
endif::git-pull[]
6866

6967
-f::
7068
--force::
@@ -95,6 +93,7 @@ ifndef::git-pull[]
9593
--[no-]write-commit-graph::
9694
Write a commit-graph after fetching. This overrides the config
9795
setting `fetch.writeCommitGraph`.
96+
endif::git-pull[]
9897

9998
-p::
10099
--prune::
@@ -107,6 +106,7 @@ ifndef::git-pull[]
107106
was cloned with the --mirror option), then they are also
108107
subject to pruning. Supplying `--prune-tags` is a shorthand for
109108
providing the tag refspec.
109+
ifndef::git-pull[]
110110
+
111111
See the PRUNING section below for more details.
112112

@@ -133,7 +133,6 @@ endif::git-pull[]
133133
behavior for a remote may be specified with the remote.<name>.tagOpt
134134
setting. See linkgit:git-config[1].
135135

136-
ifndef::git-pull[]
137136
--refmap=<refspec>::
138137
When fetching refs listed on the command line, use the
139138
specified refspec (can be given more than once) to map the
@@ -154,6 +153,7 @@ ifndef::git-pull[]
154153
is used (though tags may be pruned anyway if they are also the
155154
destination of an explicit refspec; see `--prune`).
156155

156+
ifndef::git-pull[]
157157
--recurse-submodules[=yes|on-demand|no]::
158158
This option controls if and under what conditions new commits of
159159
populated submodules should be fetched too. It can be used as a
@@ -164,6 +164,7 @@ ifndef::git-pull[]
164164
when the superproject retrieves a commit that updates the submodule's
165165
reference to a commit that isn't already in the local submodule
166166
clone.
167+
endif::git-pull[]
167168

168169
-j::
169170
--jobs=<n>::
@@ -177,9 +178,11 @@ parallel. To control them independently, use the config settings
177178
Typically, parallel recursive and multi-remote fetches will be faster. By
178179
default fetches are performed sequentially, not in parallel.
179180

181+
ifndef::git-pull[]
180182
--no-recurse-submodules::
181183
Disable recursive fetching of submodules (this has the same effect as
182184
using the `--recurse-submodules=no` option).
185+
endif::git-pull[]
183186

184187
--set-upstream::
185188
If the remote is fetched successfully, pull and add upstream
@@ -188,6 +191,7 @@ default fetches are performed sequentially, not in parallel.
188191
see `branch.<name>.merge` and `branch.<name>.remote` in
189192
linkgit:git-config[1].
190193

194+
ifndef::git-pull[]
191195
--submodule-prefix=<path>::
192196
Prepend <path> to paths printed in informative messages
193197
such as "Fetching submodule foo". This option is used

0 commit comments

Comments
 (0)