From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 24 Mar 2010 23:24:03 +0000 (-0700)
Subject: Merge branch 'jk/maint-add-ignored-dir' into maint
X-Git-Tag: v1.7.0.4~17
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=bcbbe4f9d9afa025024f18a474d11bfec32e3207;p=git.git

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
---

bcbbe4f9d9afa025024f18a474d11bfec32e3207