Merge branch 'maint-1.6.4' into maint
commit071b489682f68c5e205ed3af2a7fe997f1d7c467
authorJunio C Hamano <gitster@pobox.com>
Sun, 25 Oct 2009 22:34:41 +0000 (25 15:34 -0700)
committerJunio C Hamano <gitster@pobox.com>
Sun, 25 Oct 2009 22:34:41 +0000 (25 15:34 -0700)
treed4c23836931ae859a95e1c62246a1618ae0338df
parent3319df6f3aa3271124847e2c91c7e6d0be961bc6
parentcaa7dac163f7f7fc827da6fd4a5aba259a50e1ab
Merge branch 'maint-1.6.4' into maint

* maint-1.6.4:
  ls-files: excludes should not impact tracked files