diff options
| -rw-r--r-- | Documentation/config/diff.txt | 2 | ||||
| -rw-r--r-- | Documentation/config/merge.txt | 2 | ||||
| -rw-r--r-- | diff.c | 2 | ||||
| -rw-r--r-- | merge-ort.c | 2 | ||||
| -rw-r--r-- | merge-recursive.c | 2 |
5 files changed, 5 insertions, 5 deletions
diff --git a/Documentation/config/diff.txt b/Documentation/config/diff.txt index d1b5cfa..32f8483 100644 --- a/Documentation/config/diff.txt +++ b/Documentation/config/diff.txt @@ -120,7 +120,7 @@ diff.orderFile:: diff.renameLimit:: The number of files to consider in the exhaustive portion of copy/rename detection; equivalent to the 'git diff' option - `-l`. If not set, the default value is currently 400. This + `-l`. If not set, the default value is currently 1000. This setting has no effect if rename detection is turned off. diff.renames:: diff --git a/Documentation/config/merge.txt b/Documentation/config/merge.txt index 7cd6d78..e27cc63 100644 --- a/Documentation/config/merge.txt +++ b/Documentation/config/merge.txt @@ -37,7 +37,7 @@ merge.renameLimit:: rename detection during a merge. If not specified, defaults to the value of diff.renameLimit. If neither merge.renameLimit nor diff.renameLimit are specified, - currently defaults to 1000. This setting has no effect if + currently defaults to 7000. This setting has no effect if rename detection is turned off. merge.renames:: @@ -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; diff --git a/merge-ort.c b/merge-ort.c index b954f71..8a84375 100644 --- a/merge-ort.c +++ b/merge-ort.c @@ -2558,7 +2558,7 @@ static void detect_regular_renames(struct merge_options *opt, diff_opts.detect_rename = DIFF_DETECT_RENAME; diff_opts.rename_limit = opt->rename_limit; if (opt->rename_limit <= 0) - diff_opts.rename_limit = 1000; + diff_opts.rename_limit = 7000; diff_opts.rename_score = opt->rename_score; diff_opts.show_rename_progress = opt->show_rename_progress; diff_opts.output_format = DIFF_FORMAT_NO_OUTPUT; diff --git a/merge-recursive.c b/merge-recursive.c index 4327e0c..f19f8cc 100644 --- a/merge-recursive.c +++ b/merge-recursive.c @@ -1879,7 +1879,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; |