Merge branch 'jh/dirstat-lines'

[git.git] / diff.h

diff --git a/diff.h b/diff.h
index d83e53e9d465ba73808ff5071b17b7f13ad27b09..adb40ba273ffec74010a36e98a538fcc204919f1 100644 (file)
--- a/diff.h
+++ b/diff.h
@@ -78,6 +78,7 @@ typedef struct strbuf *(*diff_prefix_fn_t)(struct diff_options *opt, void *data)
 #define DIFF_OPT_IGNORE_UNTRACKED_IN_SUBMODULES (1 << 25)
 #define DIFF_OPT_IGNORE_DIRTY_SUBMODULES (1 << 26)
 #define DIFF_OPT_OVERRIDE_SUBMODULE_CONFIG (1 << 27)
+#define DIFF_OPT_DIRSTAT_BY_LINE     (1 << 28)
 
 #define DIFF_OPT_TST(opts, flag)    ((opts)->flags & DIFF_OPT_##flag)
 #define DIFF_OPT_SET(opts, flag)    ((opts)->flags |= DIFF_OPT_##flag)
@@ -114,7 +115,7 @@ struct diff_options {
        int needed_rename_limit;
        int degraded_cc_to_c;
        int show_rename_progress;
-       int dirstat_percent;
+       int dirstat_permille;
        int setup;
        int abbrev;
        const char *prefix;