Merge branch 'en/rename-limits-doc'
Documentation on "git diff -l<n>" and diff.renameLimit have been updated, and the defaults for these limits have been raised. * en/rename-limits-doc: rename: bump limit defaults yet again diffcore-rename: treat a rename_limit of 0 as unlimited doc: clarify documentation for rename/copy limits diff: correct warning message when renameLimit exceeded
This commit is contained in:
4
diff.c
4
diff.c
@ -35,7 +35,7 @@
|
||||
|
||||
static int diff_detect_rename_default;
|
||||
static int diff_indent_heuristic = 1;
|
||||
static int diff_rename_limit_default = 400;
|
||||
static int diff_rename_limit_default = 1000;
|
||||
static int diff_suppress_blank_empty;
|
||||
static int diff_use_color_default = -1;
|
||||
static int diff_color_moved_default;
|
||||
@ -6295,7 +6295,7 @@ static int is_summary_empty(const struct diff_queue_struct *q)
|
||||
}
|
||||
|
||||
static const char rename_limit_warning[] =
|
||||
N_("inexact rename detection was skipped due to too many files.");
|
||||
N_("exhaustive rename detection was skipped due to too many files.");
|
||||
|
||||
static const char degrade_cc_to_c_warning[] =
|
||||
N_("only found copies from modified paths due to too many files.");
|
||||
|
||||
Reference in New Issue
Block a user