Re: [PATCH v2] merge-recursive: option to disable renames

"Felipe Gonçalves Assis" writes: > @@ -482,10 +482,13 @@ static struct string_list *get_renames(struct > merge_options *o, > struct diff_options opts; > > renames = xcalloc(1, sizeof(struct string_list)); > + if (!o->detect_rename) > +

[PATCH v2] merge-recursive: option to disable renames

The recursive strategy turns on rename detection by default. Add a strategy option to disable rename detection even for exact renames. Signed-off-by: Felipe Gonçalves Assis --- Following Hamano's review, this patch includes a strategy option "renames" and simplifies the