summaryrefslogtreecommitdiff
path: root/Documentation/config.txt
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2018-09-24 17:30:50 (GMT)
committerJunio C Hamano <gitster@pobox.com>2018-09-24 17:30:51 (GMT)
commit5b39d49515bc07bc36bda8bc330b41bf06d5042e (patch)
tree2889b96b6fbcb780dba081fa5e880b458db8c0fb /Documentation/config.txt
parentf8649f8cfc81f9c8b00e32bffc89c3e30cb2a3c0 (diff)
parentdb2d36fad8b6b495a5064ea89d3bed1a48841ba9 (diff)
downloadgit-5b39d49515bc07bc36bda8bc330b41bf06d5042e.zip
git-5b39d49515bc07bc36bda8bc330b41bf06d5042e.tar.gz
git-5b39d49515bc07bc36bda8bc330b41bf06d5042e.tar.bz2
Merge branch 'bw/protocol-v2'
Doc fix. * bw/protocol-v2: config: document value 2 for protocol.version
Diffstat (limited to 'Documentation/config.txt')
-rw-r--r--Documentation/config.txt2
1 files changed, 2 insertions, 0 deletions
diff --git a/Documentation/config.txt b/Documentation/config.txt
index 8d85d1a..ad0f451 100644
--- a/Documentation/config.txt
+++ b/Documentation/config.txt
@@ -2856,6 +2856,8 @@ protocol.version::
* `1` - the original wire protocol with the addition of a version string
in the initial response from the server.
+* `2` - link:technical/protocol-v2.html[wire protocol version 2].
+
--
pull.ff::