diff options
author | Junio C Hamano <gitster@pobox.com> | 2018-05-30 08:04:04 +0300 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2018-05-30 08:04:04 +0300 |
commit | 6e2ba77bda8a23f911ac7e6dd8a313f4f03afb5e (patch) | |
tree | 11ca48aef79f68e740aa7a97c4956327d58114cb /diff.c | |
parent | c5aa4bccb5ffcc01e45915c00d2fce30ce959dab (diff) | |
parent | 6f10a09e0a1a7c3c3a6ee8e67390a4839dbe6a1b (diff) |
Merge branch 'bp/merge-rename-config'
With merge.renames configuration set to false, the recursive merge
strategy can be told not to spend cycles trying to find renamed
paths and merge them accordingly.
* bp/merge-rename-config:
merge: pass aggressive when rename detection is turned off
merge: add merge.renames config setting
merge: update documentation for {merge,diff}.renameLimit
Diffstat (limited to 'diff.c')
-rw-r--r-- | diff.c | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -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; |