Merge branch 'jk/maint-1.6.3-ls-files-i' into maint
authorJunio C Hamano <gitster@pobox.com>
Mon, 16 Nov 2009 07:07:32 +0000 (23:07 -0800)
committerJunio C Hamano <gitster@pobox.com>
Mon, 16 Nov 2009 07:07:32 +0000 (23:07 -0800)
commit958742ba43a0e3847cc7095869f0d96febe47132
treea1617297d94ecff73a737dcb333b6996be7cb8da
parent3e606ea7ca432c084677ecd52d64650cceef2e77
parent500348aa6859e436a890f5f5a7e0eeea8ef6c1de
Merge branch 'jk/maint-1.6.3-ls-files-i' into maint

* jk/maint-1.6.3-ls-files-i:
  ls-files: unbreak "ls-files -i"
Documentation/git-ls-files.txt
builtin-ls-files.c