Merge branch 'jk/maint-1.6.3-ls-files-no-ignore-cached'
commite38d1c555e56a9b19f69250f22d2965b621a04af
authorJunio C Hamano <gitster@pobox.com>
Mon, 19 Oct 2009 06:01:22 +0000 (18 23:01 -0700)
committerJunio C Hamano <gitster@pobox.com>
Mon, 19 Oct 2009 06:01:22 +0000 (18 23:01 -0700)
tree7a93d05256f28ef374cb4db3283b7fcaed800d1f
parent03fee47d89fd58c510a9c908fba51d58e1e24360
parentb5227d80aee5173bfda6aa43a890d03110b0df26
Merge branch 'jk/maint-1.6.3-ls-files-no-ignore-cached'

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