From 85b460305ce7ed399c83499851f46c4f870ce280 Mon Sep 17 00:00:00 2001 From: Ben Peart Date: Wed, 2 May 2018 16:01:14 +0000 Subject: 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 Helped-by: Elijah Newren Signed-off-by: Ben Peart Reviewed-by: Elijah Newren Signed-off-by: Junio C Hamano --- diff.h | 1 + 1 file changed, 1 insertion(+) (limited to 'diff.h') diff --git a/diff.h b/diff.h index d29560f822..dedac472ca 100644 --- a/diff.h +++ b/diff.h @@ -324,6 +324,7 @@ extern int git_diff_ui_config(const char *var, const char *value, void *cb); extern void diff_setup(struct diff_options *); extern int diff_opt_parse(struct diff_options *, const char **, int, const char *); extern void diff_setup_done(struct diff_options *); +extern int git_config_rename(const char *var, const char *value); #define DIFF_DETECT_RENAME 1 #define DIFF_DETECT_COPY 2 -- cgit v1.3