summaryrefslogtreecommitdiff
path: root/Documentation
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2018-11-21 13:57:57 (GMT)
committerJunio C Hamano <gitster@pobox.com>2018-11-21 13:57:57 (GMT)
commit3ae0ac65cff232db66282efa931c0e7e83a60e24 (patch)
tree126182f40bad9c32bf971bfbb484f329c972b031 /Documentation
parentd5e4cbabcf85152c5e630b018e489deb1a014f2f (diff)
parentdb2d36fad8b6b495a5064ea89d3bed1a48841ba9 (diff)
downloadgit-3ae0ac65cff232db66282efa931c0e7e83a60e24.zip
git-3ae0ac65cff232db66282efa931c0e7e83a60e24.tar.gz
git-3ae0ac65cff232db66282efa931c0e7e83a60e24.tar.bz2
Merge branch 'bw/protocol-v2' into maint
Doc fix. * bw/protocol-v2: config: document value 2 for protocol.version
Diffstat (limited to 'Documentation')
-rw-r--r--Documentation/config.txt2
1 files changed, 2 insertions, 0 deletions
diff --git a/Documentation/config.txt b/Documentation/config.txt
index eb66a11..ee3b5dd 100644
--- a/Documentation/config.txt
+++ b/Documentation/config.txt
@@ -2828,6 +2828,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::