From: Junio C Hamano <gitster@pobox.com>
Date: Sun, 25 Oct 2009 22:34:27 +0000 (-0700)
Subject: Merge branch 'jk/maint-1.6.3-ls-files-no-ignore-cached' into maint-1.6.4
X-Git-Tag: v1.6.5.2~2^2
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=caa7dac163f7f7fc827da6fd4a5aba259a50e1ab;p=git.git

Merge branch 'jk/maint-1.6.3-ls-files-no-ignore-cached' into maint-1.6.4

* jk/maint-1.6.3-ls-files-no-ignore-cached:
  ls-files: excludes should not impact tracked files
---

caa7dac163f7f7fc827da6fd4a5aba259a50e1ab