Merge branch 'ds/multi-pack-index'

diff --git a/Documentation/config.txt b/Documentation/config.txt
index 69a27eb688167e0c27f6f62bf14c5d5218cc20a8..6ecd70df0a5324eed8afe206e945aa1598d6aaad 100644 (file)
--- a/Documentation/config.txt
+++ b/Documentation/config.txt
@@ -937,6 +937,11 @@ core.useReplaceRefs::
        option was given on the command line. See linkgit:git[1] and
        linkgit:git-replace[1] for more information.
 
+core.multiPackIndex::
+       Use the multi-pack-index file to track multiple packfiles using a
+       single index. See link:technical/multi-pack-index.html[the
+       multi-pack-index design document].
+
 core.sparseCheckout::
        Enable "sparse checkout" feature. See section "Sparse checkout" in
        linkgit:git-read-tree[1] for more information.