Merge branch 'maint'
authorJunio C Hamano <gitster@pobox.com>
Sun, 16 Nov 2008 08:49:20 +0000 (00:49 -0800)
committerJunio C Hamano <gitster@pobox.com>
Sun, 16 Nov 2008 08:49:20 +0000 (00:49 -0800)
* maint:
Teach ls-files --with-tree=<tree> to work with options other than -c
builtin-ls-files.c: coding style fix.

Trivial merge