Merge branch 'an/ignore-doc-update' into maint

diff --git a/Documentation/gitignore.txt b/Documentation/gitignore.txt
index 7dff340e4e93e5eb85f269aa95802394ddbbf215..d47b1ae29637269859bc7f41d0fc49732c8f39aa 100644 (file)
--- a/Documentation/gitignore.txt
+++ b/Documentation/gitignore.txt
@@ -132,6 +132,14 @@ full pathname may have special meaning:
  - Other consecutive asterisks are considered regular asterisks and
    will match according to the previous rules.
 
+CONFIGURATION
+-------------
+
+The optional configuration variable `core.excludesFile` indicates a path to a
+file containing patterns of file names to exclude, similar to
+`$GIT_DIR/info/exclude`.  Patterns in the exclude file are used in addition to
+those in `$GIT_DIR/info/exclude`.
+
 NOTES
 -----