Merge branch 'jn/bisect-coding-style'

diff --git a/Documentation/glossary-content.txt b/Documentation/glossary-content.txt
index b7e7ab5849fa40f47b6bf1f3dc1e2f8a7967bdcd..378306f58162fdfee900b48b8bb6ad8171cbfca3 100644 (file)
--- a/Documentation/glossary-content.txt
+++ b/Documentation/glossary-content.txt
@@ -379,6 +379,11 @@ full pathname may have special meaning:
  - Other consecutive asterisks are considered invalid.
 +
 Glob magic is incompatible with literal magic.
+
+exclude;;
+       After a path matches any non-exclude pathspec, it will be run
+       through all exclude pathspec (magic signature: `!`). If it
+       matches, the path is ignored.
 --
 
 [[def_parent]]parent::