Merge branch 'jk/maint-1.6.3-ls-files-no-ignore-cached' into maint-1.6.4
commitcaa7dac163f7f7fc827da6fd4a5aba259a50e1ab
authorJunio C Hamano <gitster@pobox.com>
Sun, 25 Oct 2009 22:34:27 +0000 (25 15:34 -0700)
committerJunio C Hamano <gitster@pobox.com>
Sun, 25 Oct 2009 22:34:27 +0000 (25 15:34 -0700)
treea64ab3cffd7aea248fe824732a270c76c3ba2612
parent1c92a08f286453bd28a1f6153249b2e2cf63cb38
parentb5227d80aee5173bfda6aa43a890d03110b0df26
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
builtin-ls-files.c