diff options
author | Junio C Hamano <gitster@pobox.com> | 2020-09-29 14:01:20 -0700 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2020-09-29 14:01:20 -0700 |
commit | e76ae330099f97d3a868cacf311f420203f51a67 (patch) | |
tree | 2a8a44264a0c409053d3459c59c8cdd44502361a /Documentation | |
parent | Merge branch 'bc/clone-with-git-default-hash-fix' (diff) | |
parent | protocol: re-enable v2 protocol by default (diff) | |
download | tgif-e76ae330099f97d3a868cacf311f420203f51a67.tar.xz |
Merge branch 'jk/make-protocol-v2-the-default'
The transport protocol v2 has become the default again.
* jk/make-protocol-v2-the-default:
protocol: re-enable v2 protocol by default
Diffstat (limited to 'Documentation')
-rw-r--r-- | Documentation/config/feature.txt | 4 | ||||
-rw-r--r-- | Documentation/config/protocol.txt | 3 |
2 files changed, 1 insertions, 6 deletions
diff --git a/Documentation/config/feature.txt b/Documentation/config/feature.txt index c0cbf2bb1c..cdecd04e5b 100644 --- a/Documentation/config/feature.txt +++ b/Documentation/config/feature.txt @@ -14,10 +14,6 @@ feature.experimental:: + * `fetch.negotiationAlgorithm=skipping` may improve fetch negotiation times by skipping more commits at a time, reducing the number of round trips. -+ -* `protocol.version=2` speeds up fetches from repositories with many refs by -allowing the client to specify which refs to list before the server lists -them. feature.manyFiles:: Enable config options that optimize for repos with many files in the diff --git a/Documentation/config/protocol.txt b/Documentation/config/protocol.txt index c46e9b3d00..756591d77b 100644 --- a/Documentation/config/protocol.txt +++ b/Documentation/config/protocol.txt @@ -48,8 +48,7 @@ protocol.version:: If set, clients will attempt to communicate with a server using the specified protocol version. If the server does not support it, communication falls back to version 0. - If unset, the default is `0`, unless `feature.experimental` - is enabled, in which case the default is `2`. + If unset, the default is `2`. Supported versions: + -- |