diff options
| author | Junio C Hamano <gitster@pobox.com> | 2018-11-13 22:37:19 +0900 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2018-11-13 22:37:19 +0900 |
| commit | 25e4da89edc5339019f0d7c29a21ef4e08cccf24 (patch) | |
| tree | 9e1782553ba16f42b8f08c79582f9639a8cab6f6 /Documentation/gitignore.txt | |
| parent | 8c758f9a67a265ae51beddfd9895d48a42c2af13 (diff) | |
| parent | e5bbe09e88545cd1a3bcf2b157f020f92e0b5def (diff) | |
| download | git-25e4da89edc5339019f0d7c29a21ef4e08cccf24.tar.gz | |
Merge branch 'nd/wildmatch-double-asterisk'
A pattern with '**' that does not have a slash on either side used
to be an invalid one, but the code now treats such double-asterisks
the same way as two normal asterisks that happen to be adjacent to
each other.
* nd/wildmatch-double-asterisk:
wildmatch: change behavior of "foo**bar" in WM_PATHNAME mode
Diffstat (limited to 'Documentation/gitignore.txt')
| -rw-r--r-- | Documentation/gitignore.txt | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/Documentation/gitignore.txt b/Documentation/gitignore.txt index d107daaffd..1c94f08ff4 100644 --- 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 ----- |