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 | |
| 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>
| -rw-r--r-- | Documentation/config.txt | 2 | ||||
| -rw-r--r-- | Documentation/fetch-options.txt | 3 |
2 files changed, 5 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 diff --git a/Documentation/fetch-options.txt b/Documentation/fetch-options.txt index 2d09f87b4b..8bc36af4b1 100644 --- a/Documentation/fetch-options.txt +++ b/Documentation/fetch-options.txt @@ -57,6 +57,9 @@ commits reachable from any of the given commits. The argument to this option may be a glob on ref names, a ref, or the (possibly abbreviated) SHA-1 of a commit. Specifying a glob is equivalent to specifying this option multiple times, one for each matching ref name. ++ +See also the `fetch.negotiationAlgorithm` configuration variable +documented in linkgit:git-config[1]. ifndef::git-pull[] --dry-run:: |