Merge branch 'jc/ls-files-o'
commit4dc870d90cf4cd30b30b59054603fbb09dca1f41
authorJunio C Hamano <junkio@cox.net>
Fri, 10 Feb 2006 06:19:07 +0000 (9 22:19 -0800)
committerJunio C Hamano <junkio@cox.net>
Fri, 10 Feb 2006 06:19:07 +0000 (9 22:19 -0800)
tree0ba793dc46a6e13fd0df65732782f60be504c993
parent91c7674371c101766242b52ea1880cd919cb3075
parent701ca744e386c2429ca44072ea987bbb4bdac7ce
Merge branch 'jc/ls-files-o'

* jc/ls-files-o:
  ls-files: honour per-directory ignore file from higher directories.