diff options
author | Ævar Arnfjörð Bjarmason <avarab@gmail.com> | 2018-08-01 15:18:35 +0000 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2018-08-01 11:07:48 -0700 |
commit | 526608284a7600c5f0bcd6f5435ee680d79347ef (patch) | |
tree | 895f3ea305d4ad94aba013975566523c02710975 /Documentation/git-merge.txt | |
parent | negotiator: unknown fetch.negotiationAlgorithm should error out (diff) | |
download | tgif-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/git-merge.txt')
0 files changed, 0 insertions, 0 deletions