From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 24 Feb 2016 21:25:59 +0000 (-0800)
Subject: Merge branch 'nd/exclusion-regression-fix'
X-Git-Tag: v2.8.0-rc0~29
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=5e57f9c3dfe7dd44a1b56bb5b3327d7a1356ec7c;p=thirdparty%2Fgit.git

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()
---

5e57f9c3dfe7dd44a1b56bb5b3327d7a1356ec7c