summaryrefslogtreecommitdiff
path: root/diff.h
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2008-02-24 18:14:53 -0800
committerJunio C Hamano <gitster@pobox.com>2008-02-24 18:14:53 -0800
commita2de3a17faed90c0a7d35e3f48470549b284c4ec (patch)
tree47c8259f38d84cdebdc1fd7b0cee83cfacea8c78 /diff.h
parente38f892d1832977511c4e7c82204c7f94c3a3232 (diff)
parent2b0b551d7662a4246ed55b6a7029ba3caa65cf98 (diff)
downloadgit-a2de3a17faed90c0a7d35e3f48470549b284c4ec.tar.gz
Merge branch 'lt/dirstat'
* lt/dirstat: diff --dirstat: saner handling of binary and unmerged files Add "--dirstat" for some directory statistics
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 8e73f07d7e..c5d3a4f965 100644
--- a/diff.h
+++ b/diff.h
@@ -30,6 +30,8 @@ typedef void (*diff_format_fn_t)(struct diff_queue_struct *q,
#define DIFF_FORMAT_SUMMARY 0x0008
#define DIFF_FORMAT_PATCH 0x0010
#define DIFF_FORMAT_SHORTSTAT 0x0020
+#define DIFF_FORMAT_DIRSTAT 0x0040
+#define DIFF_FORMAT_CUMULATIVE 0x0080
/* These override all above */
#define DIFF_FORMAT_NAME 0x0100
@@ -80,6 +82,7 @@ struct diff_options {
int pickaxe_opts;
int rename_score;
int rename_limit;
+ int dirstat_percent;
int setup;
int abbrev;
const char *msg_sep;