From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 25 Feb 2008 02:14:53 +0000 (-0800)
Subject: Merge branch 'lt/dirstat'
X-Git-Tag: v1.5.5-rc0~155
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=a2de3a17faed90c0a7d35e3f48470549b284c4ec;hp=--cc;p=git.git

Merge branch 'lt/dirstat'

* lt/dirstat:
  diff --dirstat: saner handling of binary and unmerged files
  Add "--dirstat" for some directory statistics
---

a2de3a17faed90c0a7d35e3f48470549b284c4ec