]> git.ipfire.org Git - thirdparty/git.git/commitdiff
Merge branch 'jk/maint-1.6.3-ls-files-no-ignore-cached'
authorJunio C Hamano <gitster@pobox.com>
Mon, 19 Oct 2009 06:01:22 +0000 (23:01 -0700)
committerJunio C Hamano <gitster@pobox.com>
Mon, 19 Oct 2009 06:01:22 +0000 (23:01 -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