Andrew's git / gitweb.git / diff
?
Merge branch 'kb/status-ignored-optim-2' into maint
authorJunio C Hamano <gitster@pobox.com>
Mon, 10 Jun 2013 00:05:15 +0000 (17:05 -0700)
committerJunio C Hamano <gitster@pobox.com>
Mon, 10 Jun 2013 00:05:15 +0000 (17:05 -0700)
Fix recent regression of .gitignore files that list !directory to
mark it not-ignored.

* kb/status-ignored-optim-2:
dir.c: fix ignore processing within not-ignored directories

1  2 
t/t3001-ls-files-others-exclude.sh patch | diff1 | diff2 | blob | history
diff --cc t/t3001-ls-files-others-exclude.sh
Simple merge