Merge branch 'nd/exclusion-regression-fix' into maint
authorJunio C Hamano <gitster@pobox.com>
Fri, 5 Feb 2016 22:54:11 +0000 (14:54 -0800)
committerJunio C Hamano <gitster@pobox.com>
Fri, 5 Feb 2016 22:54:11 +0000 (14:54 -0800)
The ignore mechanism saw a few regressions around untracked file
listing and sparse checkout selection areas in 2.7.0; the change
that is responsible for the regression has been reverted.

* nd/exclusion-regression-fix:
Revert "dir.c: don't exclude whole dir prematurely if neg pattern may match"

1  2 
Documentation/gitignore.txt
dir.c
t/t3001-ls-files-others-exclude.sh
Simple merge
diff --cc dir.c
Simple merge
Simple merge