diff options
author | Junio C Hamano <gitster@pobox.com> | 2016-01-20 15:23:19 -0800 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2016-01-20 15:23:19 -0800 |
commit | 4e6ba27c956c6c9b43e7196f210796bd1db478a9 (patch) | |
tree | ee957d01ddae17e1dcd2579467b90512aa263bb0 /gitignore.txt | |
parent | a7da1ba8da6521497f33dce9b3d2a46a857172cc (diff) | |
download | git-htmldocs-4e6ba27c956c6c9b43e7196f210796bd1db478a9.tar.gz |
Autogenerated HTML docs for v2.7.0-75-g3ee1e
Diffstat (limited to 'gitignore.txt')
-rw-r--r-- | gitignore.txt | 23 |
1 files changed, 4 insertions, 19 deletions
diff --git a/gitignore.txt b/gitignore.txt index 79a1948a0..473623d63 100644 --- a/gitignore.txt +++ b/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. + 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. 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,21 +141,6 @@ 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) - - - The rules to exclude the parent directory must not end with a - trailing slash. - - - The rules to exclude the parent directory must have at least one - slash. - EXAMPLES -------- |