diff options
| author | Ben Peart <Ben.Peart@microsoft.com> | 2018-05-02 16:01:14 +0000 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2018-05-08 16:19:41 +0900 |
| commit | 85b460305ce7ed399c83499851f46c4f870ce280 (patch) | |
| tree | d56e1f9c1c1ab077050a6332365868e39ce5a485 /diff.h | |
| parent | a7152e9d226652e6ceaa64f099fc628aa2a909bd (diff) | |
| download | git-85b460305ce7ed399c83499851f46c4f870ce280.tar.gz | |
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>
Diffstat (limited to 'diff.h')
| -rw-r--r-- | diff.h | 1 |
1 files changed, 1 insertions, 0 deletions
@@ -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 |