mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'bp/merge-rename-config'

Browse Source 
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
This commit is contained in:
Junio C Hamano
2018-05-30 14:04:04 +09:00
parent c5aa4bccb5 6f10a09e0a
commit 6e2ba77bda
8 changed files with 69 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
diff.c
View File

@ -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;