Merge branch 'jc/gitignore-ends-with-slash'
commit987e315a6b5a5dd224602f09b9dc7c0fe9c7d024
authorJunio C Hamano <gitster@pobox.com>
Sun, 17 Feb 2008 01:57:06 +0000 (16 17:57 -0800)
committerJunio C Hamano <gitster@pobox.com>
Sun, 17 Feb 2008 01:57:06 +0000 (16 17:57 -0800)
treece10af22609413c4316e12335387bcfa0ef1bf9b
parent1ae419cb3902e6cc45538a9673539ed5316fcf30
parent6831a88ac03759a8133f10ffd52ad235a081a8a3
Merge branch 'jc/gitignore-ends-with-slash'

* jc/gitignore-ends-with-slash:
  gitignore: lazily find dtype
  gitignore(5): Allow "foo/" in ignore list to match directory "foo"
builtin-ls-files.c
cache.h
dir.c
unpack-trees.c