diff options
| author |  Ævar Arnfjörð Bjarmason <avarab@gmail.com> | 2021-06-30 18:38:11 +0200 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2021-06-30 14:57:22 -0700 |
| commit | 60fadf8bd2abe6bede48bcf42377f6c8b7c1d0bb (patch) | |
| tree | 4dab22eb420717f1395847bfd3086d5d35a82a5e /Documentation/config | |
| parent | send-pack.c: move "no refs in common" abort earlier (diff) | |
| download | tgif-60fadf8bd2abe6bede48bcf42377f6c8b7c1d0bb.tar.xz | |
fetch: document the --negotiate-only option
There was no documentation for the --negotiate-only option added in
9c1e657a8fd (fetch: teach independent negotiation (no packfile),
2021-05-04), only documentation for the related push.negotiation
option added in the following commit in 477673d6f39 (send-pack:
support push negotiation, 2021-05-04).
Let's document it, and update the cross-linking I'd added between
--negotiation-tip=* and 'fetch.negotiationAlgorithm' in
526608284a7 (fetch doc: cross-link two new negotiation options,
2018-08-01).
I think it would be better to say "in common with the remote" here
than "...the server", but the documentation for --negotiation-tip=*
above this talks about "the server", so let's continue doing that in
this related option. See 3390e42adb3 (fetch-pack: support negotiation
tip whitelist, 2018-07-02) for that documentation.
Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation/config')
| -rw-r--r-- | Documentation/config/fetch.txt | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/Documentation/config/fetch.txt b/Documentation/config/fetch.txt index 6af6f5edb2..63748c02b7 100644 --- a/Documentation/config/fetch.txt +++ b/Documentation/config/fetch.txt @@ -69,7 +69,8 @@ fetch.negotiationAlgorithm:: setting defaults to "skipping". Unknown values will cause 'git fetch' to error out. + -See also the `--negotiation-tip` option for linkgit:git-fetch[1]. +See also the `--negotiate-only` and `--negotiation-tip` options to +linkgit:git-fetch[1]. fetch.showForcedUpdates:: Set to false to enable `--no-show-forced-updates` in |