[PATCH 2/2] fetch doc: cross-link two new negotiation options
- From
Ævar Arnfjörð Bjarmason <avarab@gmail.com>
- Date
- Aug 1, 2018, 15:18 UTC
- Message-ID
- <20180801151835.9182-3-avarab@gmail.com>
- In-Reply-To
- <20180731180248.42787-1-jonathantanmy@google.com>
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> --- Documentation/config.txt | 2 ++ Documentation/fetch-options.txt | 3 +++ 2 files changed, 5 insertions(+)
diff --git a/Documentation/config.txt b/Documentation/config.txt index 84f73d7458..dc55ff17e0 100644 --- a/Documentation/config.txt +++ b/Documentation/config.txt @@ -1540,6 +1540,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::
-- 2.18.0.345.g5c9ce644c3