Merge branch 'bw/protocol-v2'

diff --git a/Documentation/config.txt b/Documentation/config.txt
index 112041f407eff8e71cafa03b2abc772f498a1084..ad0f4510c39c977bc95b41776eda4088d7a89885 100644 (file)
--- a/Documentation/config.txt
+++ b/Documentation/config.txt
@@ -1159,7 +1159,7 @@ and by linkgit:git-worktree[1] when 'git worktree add' refers to a
 remote branch. This setting might be used for other checkout-like
 commands or functionality in the future.
 
-checkout.optimizeNewBranch
+checkout.optimizeNewBranch::
        Optimizes the performance of "git checkout -b <new_branch>" when
        using sparse-checkout.  When set to true, git will not update the
        repo based on the current sparse-checkout settings.  This means it
@@ -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::