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
2008-05-14 12:37:28 -07:00
parent 0bdf93cbf0 b8960bbe7b
commit adf59ec127
7 changed files with 94 additions and 6 deletions
--- 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;