Merge branch 'jc/maint-1.6.1-checkout-m-custom-merge'

diff --git a/Documentation/config.txt b/Documentation/config.txt
index 9f40955f8e74a0263019eb228a548ffd2b1fd301..8acb613ec3a56dbe76459075a31fd4e66c218991 100644 (file)
--- a/Documentation/config.txt
+++ b/Documentation/config.txt
@@ -502,6 +502,10 @@ notes should be printed.
 This setting defaults to "refs/notes/commits", and can be overridden by
 the `GIT_NOTES_REF` environment variable.
 
+core.sparseCheckout::
+       Enable "sparse checkout" feature. See section "Sparse checkout" in
+       linkgit:git-read-tree[1] for more information.
+
 add.ignore-errors::
        Tells 'git-add' to continue adding files when some files cannot be
        added due to indexing errors. Equivalent to the '--ignore-errors'