summaryrefslogtreecommitdiff
path: root/diff.h
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2008-05-14 12:37:28 -0700
committerJunio C Hamano <gitster@pobox.com>2008-05-14 12:37:28 -0700
commitadf59ec127f447aa83c84f9dbe2ae4e6417f3760 (patch)
tree6f18778312b98ea48205c127c1a07e967dc4c77b /diff.h
parent0bdf93cbf0afd568384f237378ba368e751a2f0f (diff)
parentb8960bbe7bdfc0b232462f916ee8151c83afd16f (diff)
downloadgit-adf59ec127f447aa83c84f9dbe2ae4e6417f3760.tar.gz
Merge branch 'jk/renamelimit' (early part)
* 'jk/renamelimit' (early part): diff: make "too many files" rename warning optional bump rename limit defaults add merge.renamelimit config option
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 1bd94a4807..3a02d38d12 100644
--- a/diff.h
+++ b/diff.h
@@ -83,6 +83,7 @@ struct diff_options {
int pickaxe_opts;
int rename_score;
int rename_limit;
+ int warn_on_too_large_rename;
int dirstat_percent;
int setup;
int abbrev;