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
This commit is contained in:
Junio C Hamano
2011-06-29 17:03:10 -07:00
4 changed files with 78 additions and 10 deletions

1
diff.h
View File

@ -125,6 +125,7 @@ struct diff_options {
int stat_width;
int stat_name_width;
int stat_count;
const char *word_regex;
enum diff_words_type word_diff;