summaryrefslogtreecommitdiff
path: root/diff.h
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2011-06-30 00:03:10 (GMT)
committerJunio C Hamano <gitster@pobox.com>2011-06-30 00:03:10 (GMT)
commita852aac48d881d538e24d5493e218a93b12b1709 (patch)
tree9444d09ddf9301428842a6e424832eec458f5c92 /diff.h
parent0faf247485c2dc92fd8b492a5c4b49237e0338ee (diff)
parente5f85df87e8f1adb40288265ef54a16128691688 (diff)
downloadgit-a852aac48d881d538e24d5493e218a93b12b1709.zip
git-a852aac48d881d538e24d5493e218a93b12b1709.tar.gz
git-a852aac48d881d538e24d5493e218a93b12b1709.tar.bz2
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
Diffstat (limited to 'diff.h')
-rw-r--r--diff.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/diff.h b/diff.h
index 6d303c1..b920a20 100644
--- a/diff.h
+++ b/diff.h
@@ -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;