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

Merge branch 'kb/merge-recursive-rename-threshold'

Browse Source 
* kb/merge-recursive-rename-threshold:
  diff: add synonyms for -M, -C, -B
  merge-recursive: option to specify rename threshold

Conflicts:
	Documentation/diff-options.txt
	Documentation/merge-strategies.txt
This commit is contained in:
Junio C Hamano
2010-10-26 21:54:04 -07:00
parent 9b1054d93e 37ab5156ae
commit 329351feeb
6 changed files with 41 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
merge-recursive.h
View File

@ -19,6 +19,7 @@ struct merge_options {
int verbosity;
int diff_rename_limit;
int merge_rename_limit;
int rename_score;
int call_depth;
struct strbuf obuf;
struct string_list current_file_set;