Merge branch 'jt/test-protocol-version' into jt/fetch-no-update-shallow-in-proto-v2

diff --git a/Documentation/gitignore.txt b/Documentation/gitignore.txt
index d107daaffd4e84921c47951cf743d1eace11c525..1c94f08ff4dd9af173c659fb0b536f6a71a1c252 100644 (file)
--- a/Documentation/gitignore.txt
+++ b/Documentation/gitignore.txt
@@ -129,7 +129,8 @@ full pathname may have special meaning:
    matches zero or more directories. For example, "`a/**/b`"
    matches "`a/b`", "`a/x/b`", "`a/x/y/b`" and so on.
 
- - Other consecutive asterisks are considered invalid.
+ - Other consecutive asterisks are considered regular asterisks and
+   will match according to the previous rules.
 
 NOTES
 -----