Code

Merge branch 'jk/maint-add-ignored-dir' into maint
authorJunio C Hamano <gitster@pobox.com>
Wed, 24 Mar 2010 23:24:03 +0000 (16:24 -0700)
committerJunio C Hamano <gitster@pobox.com>
Wed, 24 Mar 2010 23:24:03 +0000 (16:24 -0700)
commitbcbbe4f9d9afa025024f18a474d11bfec32e3207
tree10c711f417d3b1ccb77946d0eb134e9debb9946d
parent7b676b1bb53c936770a07354ec6c6550fb31b421
parentb75aea8f5bea614f802256c436b06733486a2088
Merge branch 'jk/maint-add-ignored-dir' into maint

* jk/maint-add-ignored-dir:
  tests for "git add ignored-dir/file" without -f
  dir: fix COLLECT_IGNORED on excluded prefixes
  t0050: mark non-working test as such
dir.c