Merge branch 'tg/index-v4-format'

diff --git a/Documentation/config.txt b/Documentation/config.txt
index 73904bce55ff1d78bd10a5eb6b83f5fdf36ea74a..989eb80ac1d3b0c1b756fb7a88874fa50a00eae3 100644 (file)
--- a/Documentation/config.txt
+++ b/Documentation/config.txt
@@ -1607,6 +1607,10 @@ imap::
        The configuration variables in the 'imap' section are described
        in linkgit:git-imap-send[1].
 
+index.version::
+       Specify the version with which new index files should be
+       initialized.  This does not affect existing repositories.
+
 init.templatedir::
        Specify the directory from which templates will be copied.
        (See the "TEMPLATE DIRECTORY" section of linkgit:git-init[1].)