From: Junio C Hamano <gitster@pobox.com>
Date: Sat, 20 Mar 2010 18:29:36 +0000 (-0700)
Subject: Merge branch 'jk/maint-add-ignored-dir'
X-Git-Tag: v1.7.1-rc0~50
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=4e7d08a229a531f8d7841a8a1a892d5989130d67;p=git.git

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

4e7d08a229a531f8d7841a8a1a892d5989130d67