From: Junio C Hamano <gitster@pobox.com>
Date: Thu, 30 Jun 2011 00:03:10 +0000 (-0700)
Subject: Merge branch 'mg/diff-stat-count'
X-Git-Tag: v1.7.7-rc0~124
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=a852aac48d881d538e24d5493e218a93b12b1709;p=git.git

Merge branch 'mg/diff-stat-count'

* mg/diff-stat-count:
  diff --stat-count: finishing touches
  diff-options.txt: describe --stat-{width,name-width,count}
  diff: introduce --stat-lines to limit the stat lines
  diff.c: omit hidden entries from namelen calculation with --stat
---

a852aac48d881d538e24d5493e218a93b12b1709