summaryrefslogtreecommitdiff
path: root/builtin/init-db.c
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2015-10-07 13:38:17 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2015-10-07 13:38:17 -0700
commit506d8f1b394917c345965fc1762afa66678870c1 (patch)
tree6ff88fa3da3500254ac3b364fbf99bb95ddb5247 /builtin/init-db.c
parentMerge branch 'ti/glibc-stdio-mutex-from-signal-handler' (diff)
parentdir.c: don't exclude whole dir prematurely if neg pattern may match (diff)
downloadtgif-506d8f1b394917c345965fc1762afa66678870c1.tar.xz
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
Diffstat (limited to 'builtin/init-db.c')
0 files changed, 0 insertions, 0 deletions