Code

Merge branch 'jk/maint-add-ignored-dir'
authorJunio C Hamano <gitster@pobox.com>
Sat, 20 Mar 2010 18:29:36 +0000 (11:29 -0700)
committerJunio C Hamano <gitster@pobox.com>
Sat, 20 Mar 2010 18:29:36 +0000 (11:29 -0700)
commit4e7d08a229a531f8d7841a8a1a892d5989130d67
treea87269ea1d14f85508f2548d0cc7f75c338da566
parentf1aa782a3b72a2c4de46dc93b484eb99dc01d4d0
parentb75aea8f5bea614f802256c436b06733486a2088
Merge branch 'jk/maint-add-ignored-dir'

* 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