Merge branch 'tr/xdiff-fast-hash'

diff --git a/Documentation/git-config.txt b/Documentation/git-config.txt
index 7617d9eb2431a1dd52516b22b5e2ac4be2962f97..81b03982e372c98afaf944398e9a168554871447 100644 (file)
--- a/Documentation/git-config.txt
+++ b/Documentation/git-config.txt
@@ -181,6 +181,11 @@ See also <<FILES>>.
        Opens an editor to modify the specified config file; either
        '--system', '--global', or repository (default).
 
+--includes::
+--no-includes::
+       Respect `include.*` directives in config files when looking up
+       values. Defaults to on.
+
 [[FILES]]
 FILES
 -----