Skip to content

Commit 5266082

Browse files
avargitster
authored andcommitted
fetch doc: cross-link two new negotiation options
Users interested in the fetch.negotiationAlgorithm variable added in 42cc748 ("negotiator/skipping: skip commits during fetch", 2018-07-16) are probably interested in the related --negotiation-tip option added in 3390e42 ("fetch-pack: support negotiation tip whitelist", 2018-07-02). Change the documentation for those two to reference one another to point readers in the right direction. Signed-off-by: Ævar Arnfjörð Bjarmason <[email protected]> Signed-off-by: Junio C Hamano <[email protected]>
1 parent af3a67d commit 5266082

File tree

2 files changed

+5
-0
lines changed

2 files changed

+5
-0
lines changed

Documentation/config.txt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1500,6 +1500,8 @@ fetch.negotiationAlgorithm::
15001500
that never skips commits (unless the server has acknowledged it or one
15011501
of its descendants).
15021502
Unknown values will cause 'git fetch' to error out.
1503+
+
1504+
See also the `--negotiation-tip` option for linkgit:git-fetch[1].
15031505

15041506
format.attach::
15051507
Enable multipart/mixed attachments as the default for

Documentation/fetch-options.txt

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -57,6 +57,9 @@ commits reachable from any of the given commits.
5757
The argument to this option may be a glob on ref names, a ref, or the (possibly
5858
abbreviated) SHA-1 of a commit. Specifying a glob is equivalent to specifying
5959
this option multiple times, one for each matching ref name.
60+
+
61+
See also the `fetch.negotiationAlgorithm` configuration variable
62+
documented in linkgit:git-config[1].
6063

6164
ifndef::git-pull[]
6265
--dry-run::

0 commit comments

Comments
 (0)