From: Junio C Hamano <junkio@cox.net>
Date: Fri, 10 Feb 2006 06:19:07 +0000 (-0800)
Subject: Merge branch 'jc/ls-files-o'
X-Git-Tag: v1.2.0~28
X-Git-Url: https://git.verplant.org/?a=commitdiff_plain;h=4dc870d90cf4cd30b30b59054603fbb09dca1f41;p=git.git

Merge branch 'jc/ls-files-o'

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

4dc870d90cf4cd30b30b59054603fbb09dca1f41