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"

diff --cc Documentation/git-ls-files.txt
Simple merge

diff --cc builtin-ls-files.c
Simple merge