From: Junio C Hamano <gitster@pobox.com>
Date: Sun, 16 Nov 2008 08:49:20 +0000 (-0800)
Subject: Merge branch 'maint'
X-Git-Tag: v1.6.1-rc1~40
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=bf31115312aefd36f1571379842eebebf34dcb55;p=thirdparty%2Fgit.git

Merge branch 'maint'

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

bf31115312aefd36f1571379842eebebf34dcb55