Merge branch 'rs/strbuf-expand'

diff --git a/Documentation/config.txt b/Documentation/config.txt
index 220b9371981cb76159e150f1c6d2ab2b973d1f44..b233fe53520ab755902882906f8e76957957b658 100644 (file)
--- a/Documentation/config.txt
+++ b/Documentation/config.txt
@@ -413,6 +413,15 @@ data writes properly, but can be useful for filesystems that do not use
 journalling (traditional UNIX filesystems) or that only journal metadata
 and not file contents (OS X's HFS+, or Linux ext3 with "data=writeback").
 
+core.preloadindex::
+       Enable parallel index preload for operations like 'git diff'
++
+This can speed up operations like 'git diff' and 'git status' especially
+on filesystems like NFS that have weak caching semantics and thus
+relatively high IO latencies.  With this set to 'true', git will do the
+index comparison to the filesystem data in parallel, allowing
+overlapping IO's.
+
 alias.*::
        Command aliases for the linkgit:git[1] command wrapper - e.g.
        after defining "alias.last = cat-file commit HEAD", the invocation
@@ -820,7 +829,7 @@ gui.fastcopyblame::
        repositories at the expense of less thorough copy detection.
 
 gui.copyblamethreshold::
-       Specifies the theshold to use in 'git gui blame' original location
+       Specifies the threshold to use in 'git gui blame' original location
        detection, measured in alphanumeric characters. See the
        linkgit:git-blame[1] manual for more information on copy detection.