Merge branch 'jk/maint-1.6.3-ls-files-i'
authorJunio C Hamano <gitster@pobox.com>
Tue, 10 Nov 2009 20:33:28 +0000 (12:33 -0800)
committerJunio C Hamano <gitster@pobox.com>
Tue, 10 Nov 2009 20:33:28 +0000 (12:33 -0800)
* jk/maint-1.6.3-ls-files-i:
  ls-files: unbreak "ls-files -i"

1  2 
Documentation/git-ls-files.txt
builtin-ls-files.c

Simple merge
Simple merge