summaryrefslogtreecommitdiff
path: root/diff.h
diff options
context:
space:
mode:
authorJunio C Hamano <junkio@cox.net>2006-09-30 21:29:18 -0700
committerJunio C Hamano <junkio@cox.net>2006-09-30 21:29:18 -0700
commitdd0c367e5e1358539bdd11c3a474bb6792504d30 (patch)
tree017500fe3b098f45aef29f46691bc9b6a985b4f8 /diff.h
parent99692dc213482116f237ea58965b0ceef3827147 (diff)
parent3ed74e608a69ce0f10bfad2e4ef6cf99eec04613 (diff)
downloadgit-dd0c367e5e1358539bdd11c3a474bb6792504d30.tar.gz
Merge branch 'jc/diff-stat'
* jc/diff-stat: diff --stat: ensure at least one '-' for deletions, and one '+' for additions diff --stat=width[,name-width]: allow custom diffstat output width. diff --stat: color output. diff --stat: allow custom diffstat output width.
Diffstat (limited to 'diff.h')
-rw-r--r--diff.h3
1 files changed, 3 insertions, 0 deletions
diff --git a/diff.h b/diff.h
index 3435fe7b3f..b48c9914e7 100644
--- a/diff.h
+++ b/diff.h
@@ -69,6 +69,9 @@ struct diff_options {
const char *stat_sep;
long xdl_opts;
+ int stat_width;
+ int stat_name_width;
+
int nr_paths;
const char **paths;
int *pathlens;