Documentation/git-update-index: talk about core.splitIndex config var

Signed-off-by: Christian Couder <chriscool@tuxfamily.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/Documentation/git-update-index.txt b/Documentation/git-update-index.txt
index 7386c931627f1c2bd1303407075db9831ec4045c..e091b2a409632300a8010d3e9d039568c85aa275 100644 (file)
--- a/Documentation/git-update-index.txt
+++ b/Documentation/git-update-index.txt
@@ -171,6 +171,12 @@ may not support it yet.
        given again, all changes in $GIT_DIR/index are pushed back to
        the shared index file. This mode is designed for very large
        indexes that take a significant amount of time to read or write.
        given again, all changes in $GIT_DIR/index are pushed back to
        the shared index file. This mode is designed for very large
        indexes that take a significant amount of time to read or write.

++
+These options take effect whatever the value of the `core.splitIndex`
+configuration variable (see linkgit:git-config[1]). But a warning is
+emitted when the change goes against the configured value, as the
+configured value will take effect next time the index is read and this
+will remove the intended effect of the option.

 
 --untracked-cache::
 --no-untracked-cache::
 
 --untracked-cache::
 --no-untracked-cache::