Merge branch 'js/pre-merge-commit-hook'

diff --git a/Documentation/config/index.txt b/Documentation/config/index.txt
index de4418323583f0b6f662cb02b0c100766b20613b..7cb50b37e98dba813886adb4578435495be8e78c 100644 (file)
--- a/Documentation/config/index.txt
+++ b/Documentation/config/index.txt
@@ -3,14 +3,16 @@ index.recordEndOfIndexEntries::
        Entry" section. This reduces index load time on multiprocessor
        machines but produces a message "ignoring EOIE extension" when
        reading the index using Git versions before 2.20. Defaults to
-       'false'.
+       'true' if index.threads has been explicitly enabled, 'false'
+       otherwise.
 
 index.recordOffsetTable::
        Specifies whether the index file should include an "Index Entry
        Offset Table" section. This reduces index load time on
        multiprocessor machines but produces a message "ignoring IEOT
        extension" when reading the index using Git versions before 2.20.
-       Defaults to 'false'.
+       Defaults to 'true' if index.threads has been explicitly enabled,
+       'false' otherwise.
 
 index.threads::
        Specifies the number of threads to spawn when loading the index.
@@ -22,3 +24,4 @@ index.threads::
 index.version::
        Specify the version with which new index files should be
        initialized.  This does not affect existing repositories.
+       If `feature.manyFiles` is enabled, then the default is 4.