Code

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)
commitbf31115312aefd36f1571379842eebebf34dcb55
tree20f326130a1a40f25ac5c82b0adae7854b0b346f
parentc9d8563c815a6a90bcc15057de288684d7cae5ef
parent4b4e26d21f77d9e90125ca1c8f48592a9cd6f543
Merge branch 'maint'

* maint:
  Teach ls-files --with-tree=<tree> to work with options other than -c
  builtin-ls-files.c: coding style fix.