From: Junio C Hamano <junkio@cox.net>
Date: Thu, 9 Feb 2006 08:21:27 +0000 (-0800)
Subject: Merge branch 'jc/ls-files-o'
X-Git-Tag: v1.3.0-rc1~54^2~91
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=9a9d58520d255c54c3ca1f60eefe0bfedcab0164;p=git.git

Merge branch 'jc/ls-files-o'

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

9a9d58520d255c54c3ca1f60eefe0bfedcab0164