diff options
| author | Junio C Hamano <gitster@pobox.com> | 2014-03-14 14:23:37 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2014-03-14 14:23:37 -0700 |
| commit | dfcd354cdf38ff119c05e6e5f0e434bbc163ba41 (patch) | |
| tree | af829295b55c89013ff1502b06a39476c35ce0cf /Documentation/gitignore.txt | |
| parent | 28b68216de080405f8eb1030982b8b1e79ffd6f0 (diff) | |
| parent | 35e4d775875603c748a127c82909f5d62a410ac8 (diff) | |
| download | git-dfcd354cdf38ff119c05e6e5f0e434bbc163ba41.tar.gz | |
Merge branch 'nd/gitignore-trailing-whitespace'
Trailing whitespaces in .gitignore files, unless they are quoted for
fnmatch(3), e.g. "path\ ", are warned and ignored.
Strictly speaking, this is a backward incompatible change, but very
unlikely to bite any sane user and adjusting should be obvious and
easy.
* nd/gitignore-trailing-whitespace:
t0008: skip trailing space test on Windows
dir: ignore trailing spaces in exclude patterns
dir: warn about trailing spaces in exclude patterns
Diffstat (limited to 'Documentation/gitignore.txt')
| -rw-r--r-- | Documentation/gitignore.txt | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/Documentation/gitignore.txt b/Documentation/gitignore.txt index b08d34d84e..8734c1566c 100644 --- a/Documentation/gitignore.txt +++ b/Documentation/gitignore.txt @@ -77,6 +77,9 @@ PATTERN FORMAT Put a backslash ("`\`") in front of the first hash for patterns that begin with a hash. + - Trailing spaces are ignored unless they are quoted with backlash + ("`\`"). + - An optional prefix "`!`" which negates the pattern; any matching file excluded by a previous pattern will become included again. It is not possible to re-include a file if a parent |