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

2016-02-16 Thread Junio C Hamano
Felipe Gonçalves Assis writes: > Just a note: In git-diff, there is no "--renames". Instead, renames > are enabled by the "--find-renames[=]" option. > > 1. Do you think "rename-threshold=" should enable renames? I do not think it matters in practice, but if you have git merge-recursive

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

2016-02-16 Thread Felipe Gonçalves Assis
On 16 February 2016 at 19:49, Junio C Hamano wrote: > "Felipe Gonçalves Assis" writes: > >> +no-renames;; >> + Turn off rename detection. >> + See also linkgit:git-diff[1] `--no-renames`. > > Even though by default for merge-recursive the rename detection is > on, if we are adding an opt

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

2016-02-16 Thread Junio C Hamano
Junio C Hamano writes: > "Felipe Gonçalves Assis" writes: > >> +no-renames;; >> +Turn off rename detection. >> +See also linkgit:git-diff[1] `--no-renames`. > > Even though by default for merge-recursive the rename detection is > on, if we are adding an option to control this aspect of

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

2016-02-16 Thread Junio C Hamano
"Felipe Gonçalves Assis" writes: > +no-renames;; > + Turn off rename detection. > + See also linkgit:git-diff[1] `--no-renames`. Even though by default for merge-recursive the rename detection is on, if we are adding an option to control this aspect of the behaviour from the command lin

[PATCH] merge-recursive: option to disable renames

2016-02-15 Thread Felipe Gonçalves Assis
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 --- Hi, this is a patch relative to the "Custom merge driver with no rename detection" thread, based on suggestions by Juni