Merge branch 'mg/diff-stat-count'
authorJunio C Hamano <gitster@pobox.com>
Thu, 30 Jun 2011 00:03:10 +0000 (17:03 -0700)
committerJunio C Hamano <gitster@pobox.com>
Thu, 30 Jun 2011 00:03:10 +0000 (17:03 -0700)
commita852aac48d881d538e24d5493e218a93b12b1709
tree9444d09ddf9301428842a6e424832eec458f5c92
parent0faf247485c2dc92fd8b492a5c4b49237e0338ee
parente5f85df87e8f1adb40288265ef54a16128691688
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
Documentation/diff-options.txt
diff.c
diff.h