[PATCH v1 1/2] merge: Add merge.renames config setting
From: Ben Peart <hidden>
Date: 2018-04-20 13:36:54
Subsystem:
documentation, the rest · Maintainers:
Jonathan Corbet, Linus Torvalds
Add the ability to control rename detection for merge via a config setting. Reviewed-by: Johannes Schindelin <redacted> Signed-off-by: Ben Peart <redacted> --- Documentation/merge-config.txt | 5 +++++ merge-recursive.c | 1 + 2 files changed, 6 insertions(+)
diff --git a/Documentation/merge-config.txt b/Documentation/merge-config.txt
index 12b6bbf591..656f909eb3 100644
--- a/Documentation/merge-config.txt
+++ b/Documentation/merge-config.txt@@ -37,6 +37,11 @@ merge.renameLimit:: during a merge; if not specified, defaults to the value of diff.renameLimit. +merge.renames:: + Whether and how Git detects renames. If set to "false", + rename detection is disabled. If set to "true", basic rename + detection is enabled. This is the default. + merge.renormalize:: Tell Git that canonical representation of files in the repository has changed over time (e.g. earlier commits record
diff --git a/merge-recursive.c b/merge-recursive.c
index 9c05eb7f70..cd5367e890 100644
--- a/merge-recursive.c
+++ b/merge-recursive.c@@ -3256,6 +3256,7 @@ static void merge_recursive_config(struct merge_options *o) git_config_get_int("merge.verbosity", &o->verbosity); git_config_get_int("diff.renamelimit", &o->diff_rename_limit); git_config_get_int("merge.renamelimit", &o->merge_rename_limit); + git_config_get_bool("merge.renames", &o->detect_rename); git_config(git_xmerge_config, NULL); }
--
2.17.0.windows.1