From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 7 Oct 2015 20:38:17 +0000 (-0700)
Subject: Merge branch 'nd/ignore-then-not-ignore'
X-Git-Tag: v2.7.0-rc0~126
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/506d8f1b394917c345965fc1762afa66678870c1

Merge branch 'nd/ignore-then-not-ignore'

Allow a later "!/abc/def" to override an earlier "/abc" that
appears in the same .gitignore file to make it easier to express
"everything in /abc directory is ignored, except for ...".

* nd/ignore-then-not-ignore:
dir.c: don't exclude whole dir prematurely if neg pattern may match
dir.c: make last_exclude_matching_from_list() run til the end
---

506d8f1b394917c345965fc1762afa66678870c1