diff options
| author | Junio C Hamano <gitster@pobox.com> | 2021-07-28 20:18:02 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2021-07-28 20:18:03 (GMT) |
| commit | 268055bfdec5cc2228ade6f3ff7094632568c82a (patch) | |
| tree | 53bb23cd6e9433f955a7ca5add6b759a6d5d9df9 /merge-recursive.c | |
| parent | 546adc4950185464c75158301c854b0f55dcf465 (diff) | |
| parent | 94b82d56866793018a7a9bcbe20c1c061fa41aa8 (diff) | |
| download | git-268055bfdec5cc2228ade6f3ff7094632568c82a.zip git-268055bfdec5cc2228ade6f3ff7094632568c82a.tar.gz git-268055bfdec5cc2228ade6f3ff7094632568c82a.tar.bz2 | |
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
Diffstat (limited to 'merge-recursive.c')
| -rw-r--r-- | merge-recursive.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/merge-recursive.c b/merge-recursive.c index 03f73cf..7008a90 100644 --- a/merge-recursive.c +++ b/merge-recursive.c @@ -1880,7 +1880,7 @@ static struct diff_queue_struct *get_diffpairs(struct merge_options *opt, */ if (opts.detect_rename > DIFF_DETECT_RENAME) opts.detect_rename = DIFF_DETECT_RENAME; - opts.rename_limit = (opt->rename_limit >= 0) ? opt->rename_limit : 1000; + opts.rename_limit = (opt->rename_limit >= 0) ? opt->rename_limit : 7000; opts.rename_score = opt->rename_score; opts.show_rename_progress = opt->show_rename_progress; opts.output_format = DIFF_FORMAT_NO_OUTPUT; |