Merge branch 'jk/maint-ls-files-other' into maint
authorJunio C Hamano <gitster@pobox.com>
Sun, 2 Nov 2008 21:37:13 +0000 (13:37 -0800)
committerJunio C Hamano <gitster@pobox.com>
Sun, 2 Nov 2008 21:37:13 +0000 (13:37 -0800)
commit86e67a088c581da4da36acf0edd8c27b1033e51e
treeff6c53429e67c4f44f7c7b07cfa8bcb980c7570a
parentd11ddaff021be8006e71b43a5205c48f2dac7f18
parent98fa473887d0bebd38d568bb07232a336a642dcf
Merge branch 'jk/maint-ls-files-other' into maint

* jk/maint-ls-files-other:
  refactor handling of "other" files in ls-files and status
cache.h
read-cache.c