summaryrefslogtreecommitdiff
path: root/Documentation/config.txt
diff options
context:
space:
mode:
authorLibravatar Ævar Arnfjörð Bjarmason <avarab@gmail.com>2018-08-01 15:18:35 +0000
committerLibravatar Junio C Hamano <gitster@pobox.com>2018-08-01 11:07:48 -0700
commit526608284a7600c5f0bcd6f5435ee680d79347ef (patch)
tree895f3ea305d4ad94aba013975566523c02710975 /Documentation/config.txt
parentnegotiator: unknown fetch.negotiationAlgorithm should error out (diff)
downloadtgif-526608284a7600c5f0bcd6f5435ee680d79347ef.tar.xz
fetch doc: cross-link two new negotiation options
Users interested in the fetch.negotiationAlgorithm variable added in 42cc7485a2 ("negotiator/skipping: skip commits during fetch", 2018-07-16) are probably interested in the related --negotiation-tip option added in 3390e42adb ("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 <avarab@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation/config.txt')
-rw-r--r--Documentation/config.txt2
1 files changed, 2 insertions, 0 deletions
diff --git a/Documentation/config.txt b/Documentation/config.txt
index 46e0400e24..3b7d3926d1 100644
--- a/Documentation/config.txt
+++ b/Documentation/config.txt
@@ -1500,6 +1500,8 @@ fetch.negotiationAlgorithm::
that never skips commits (unless the server has acknowledged it or one
of its descendants).
Unknown values will cause 'git fetch' to error out.
++
+See also the `--negotiation-tip` option for linkgit:git-fetch[1].
format.attach::
Enable multipart/mixed attachments as the default for