Merge branch 'jk/maint-1.6.3-ls-files-no-ignore-cached' into maint-1.6.4
authorJunio C Hamano <gitster@pobox.com>
Sun, 25 Oct 2009 22:34:27 +0000 (15:34 -0700)
committerJunio C Hamano <gitster@pobox.com>
Sun, 25 Oct 2009 22:34:27 +0000 (15:34 -0700)
* jk/maint-1.6.3-ls-files-no-ignore-cached:
  ls-files: excludes should not impact tracked files

1  2 
builtin-ls-files.c

Simple merge