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

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