diff options
| author | Junio C Hamano <gitster@pobox.com> | 2016-03-18 11:06:15 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2016-03-18 11:06:15 -0700 |
| commit | 5cee349370bd2dce48d0d653ab4ce99bb79a3415 (patch) | |
| tree | 382693a846a87b9f1af799a1fdf35b51142757b0 /Documentation | |
| parent | 8ad3cb08690bdf9a340e47ed4fdb67cbacd1edf2 (diff) | |
| download | git-5cee349370bd2dce48d0d653ab4ce99bb79a3415.tar.gz git-5cee349370bd2dce48d0d653ab4ce99bb79a3415.tar.xz | |
Revert "Merge branch 'nd/exclusion-regression-fix'"
This reverts commit 5e57f9c3dfe7dd44a1b56bb5b3327d7a1356ec7c, reversing
changes made to e79112d21024beb997951381db21a70b087d459d.
We will be postponing nd/exclusion-regression-fix topic to later
cycle.
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/git-check-ignore.txt | 1 | ||||
| -rw-r--r-- | Documentation/git.txt | 5 | ||||
| -rw-r--r-- | Documentation/gitignore.txt | 17 |
3 files changed, 4 insertions, 19 deletions
diff --git a/Documentation/git-check-ignore.txt b/Documentation/git-check-ignore.txt index f60ee051f..e94367a5e 100644 --- a/Documentation/git-check-ignore.txt +++ b/Documentation/git-check-ignore.txt @@ -114,7 +114,6 @@ SEE ALSO linkgit:gitignore[5] linkgit:gitconfig[5] linkgit:git-ls-files[1] -GIT_TRACE_EXCLUDE in linkgit:git[1] GIT --- diff --git a/Documentation/git.txt b/Documentation/git.txt index 5f3647ea3..a9120a877 100644 --- a/Documentation/git.txt +++ b/Documentation/git.txt @@ -1069,11 +1069,6 @@ of clones and fetches. cloning of shallow repositories. See 'GIT_TRACE' for available trace output options. -'GIT_TRACE_EXCLUDE':: - Enables trace messages that can help debugging .gitignore - processing. See 'GIT_TRACE' for available trace output - options. - 'GIT_LITERAL_PATHSPECS':: Setting this variable to `1` will cause Git to treat all pathspecs literally, rather than as glob patterns. For example, diff --git a/Documentation/gitignore.txt b/Documentation/gitignore.txt index 3ded6fdc9..473623d63 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. + 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,15 +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) - EXAMPLES -------- |