Merge branch 'jc/ls-files-o'
authorJunio C Hamano <junkio@cox.net>
Thu, 9 Feb 2006 08:21:27 +0000 (00:21 -0800)
committerJunio C Hamano <junkio@cox.net>
Thu, 9 Feb 2006 08:21:27 +0000 (00:21 -0800)
commit9a9d58520d255c54c3ca1f60eefe0bfedcab0164
treeb5b011702269510f78efd6b3cdabf3691dd8aed9
parent3c91b216ab481eac0d9928471ecc7f1f12599445
parent701ca744e386c2429ca44072ea987bbb4bdac7ce
Merge branch 'jc/ls-files-o'

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