diff options
| author |  Nguyễn Thái Ngọc Duy <pclouds@gmail.com> | 2016-02-15 16:03:39 +0700 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2016-02-15 15:32:33 -0800 |
| commit | d589a67eceacd1cc171bbe94906ca7c9a0edd8c5 (patch) | |
| tree | fa380845f615c5f0742f6ff61bd20befbf06db77 /Documentation | |
| parent | dir.c: support marking some patterns already matched (diff) | |
| download | tgif-d589a67eceacd1cc171bbe94906ca7c9a0edd8c5.tar.xz | |
dir.c: don't exclude whole dir prematurely
If there is a pattern "!foo/bar", this patch makes it not exclude
"foo" right away. This gives us a chance to examine "foo" and
re-include "foo/bar".
Helped-by: brian m. carlson <sandals@crustytoothpaste.net>
Helped-by: Micha Wiedenmann <mw-u2@gmx.de>
Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/gitignore.txt | 17 |
1 files changed, 13 insertions, 4 deletions
diff --git a/Documentation/gitignore.txt b/Documentation/gitignore.txt index 473623d631..3ded6fdc99 100644 --- a/Documentation/gitignore.txt +++ b/Documentation/gitignore.txt @@ -82,12 +82,12 @@ PATTERN FORMAT - 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 - directory of that file is excluded. Git doesn't list excluded - directories for performance reasons, so any patterns on contained - files have no effect, no matter where they are defined. + included again. Put a backslash ("`\`") in front of the first "`!`" for patterns that begin with a literal "`!`", for example, "`\!important!.txt`". + It is possible to re-include a file if a parent directory of that + file is excluded if certain conditions are met. See section NOTES + for detail. - If the pattern ends with a slash, it is removed for the purpose of the following description, but it would only find @@ -141,6 +141,15 @@ not tracked by Git remain untracked. To stop tracking a file that is currently tracked, use 'git rm --cached'. +To re-include files or directories when their parent directory is +excluded, the following conditions must be met: + + - The rules to exclude a directory and re-include a subset back must + be in the same .gitignore file. + + - The directory part in the re-include rules must be literal (i.e. no + wildcards) + EXAMPLES -------- |