projects / git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 2b72dbb 57534ee)
Merge branch 'nd/ignore-then-not-ignore'
authorJunio C Hamano <gitster@pobox.com>
Wed, 7 Oct 2015 20:38:17 +0000 (13:38 -0700)
committerJunio C Hamano <gitster@pobox.com>
Wed, 7 Oct 2015 20:38:17 +0000 (13:38 -0700)
commit506d8f1b394917c345965fc1762afa66678870c1
tree6ff88fa3da3500254ac3b364fbf99bb95ddb5247tree | snapshot
parent2b72dbbcf3a1d6c6813db2c13afaa1d0d8585f7bcommit | diff
parent57534ee77d22e725d971ee89c77dc6aad61c573fcommit | diff
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
Documentation/gitignore.txt diff1 | diff2 | blob | history
dir.c diff1 | diff2 | blob | history
t/t3001-ls-files-others-exclude.sh diff1 | diff2 | blob | history
Unnamed repository; edit this file 'description' to name the repository.