projects / git.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 7b676b1 b75aea8)
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)
* 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

1  2 
dir.c patch | diff1 | diff2 | blob | history

diff --cc dir.c
Simple merge
Git—the stupid content tracker