Merge branch 'nd/exclusion-regression-fix'

Another try to add support to the ignore mechanism that lets you
say "this is excluded" and then later say "oh, no, this part (that
is a subset of the previous part) is not excluded".

* nd/exclusion-regression-fix:
dir.c: don't exclude whole dir prematurely
dir.c: support marking some patterns already matched
dir.c: support tracing exclude
dir.c: fix match_pathname()

diff --combined Documentation/git.txt
index 9dffb4c03577770b0a2942938211ee05876003db,2c4f0f247065966e26bd1971db66ed74aacfa54b..2754af8f7782d4a13fce4f5752737e3106491f22
--- 1/Documentation/git.txt
--- 2/Documentation/git.txt
+++ b/Documentation/git.txt
@@@ -43,10 -43,9 +43,10 @@@ unreleased) version of Git, that is ava
  branch of the `git.git` repository.
  Documentation for older releases are available here:
  
 -* link:v2.7.1/git.html[documentation for release 2.7.1]
 +* link:v2.7.2/git.html[documentation for release 2.7.2]
  
  * release notes for
 +  link:RelNotes/2.7.2.txt[2.7.2],
    link:RelNotes/2.7.1.txt[2.7.1],
    link:RelNotes/2.7.0.txt[2.7].
  
@@@ -1065,6 -1064,11 +1065,11 @@@ 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,
@@@ -1125,6 -1129,8 +1130,6 @@@
          - `ssh`: git over ssh (including `host:path` syntax,
            `git+ssh://`, etc).
  
 -        - `rsync`: git over rsync
 -
          - `http`: git over http, both "smart http" and "dumb http".
            Note that this does _not_ include `https`; if you want both,
            you should specify both as `http:https`.