commit 85b460305ce7ed399c83499851f46c4f870ce280
author Ben Peart <Ben.Peart@microsoft.com> Wed May 02 16:01:14 2018 +0000
committer Junio C Hamano <gitster@pobox.com> Tue May 08 16:19:41 2018 +0900
tree d56e1f9c1c1ab077050a6332365868e39ce5a485
parent a7152e9d226652e6ceaa64f099fc628aa2a909bd

merge: add merge.renames config setting

Add the ability to control rename detection for merge via a config setting.
This setting behaves the same and defaults to the value of diff.renames but only
applies to merge.

Reviewed-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Helped-by: Elijah Newren <newren@gmail.com>
Signed-off-by: Ben Peart <benpeart@microsoft.com>
Reviewed-by: Elijah Newren <newren@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff.c

diff --git a/diff.c b/diff.c
index 1289df4..5dfc24a 100644
--- a/diff.c
+++ b/diff.c
@@ -177,7 +177,7 @@ static int parse_submodule_params(struct diff_options *options, const char *valu
 	return 0;
 }
 
-static int git_config_rename(const char *var, const char *value)
+int git_config_rename(const char *var, const char *value)
 {
 	if (!value)
 		return DIFF_DETECT_RENAME;