Re: [PATCH v3 1/2] merge-recursive: option to disable renames

2016-02-16 Thread Felipe Gonçalves Assis
On 16 February 2016 at 23:41, Eric Sunshine wrote: > On Tue, Feb 16, 2016 at 8:11 PM, Felipe Gonçalves Assis > wrote: >> The recursive strategy turns on rename detection by default. Add a >> strategy option to disable rename detection even for

Re: [PATCH v3 1/2] merge-recursive: option to disable renames

2016-02-16 Thread Eric Sunshine
On Tue, Feb 16, 2016 at 8:11 PM, Felipe Gonçalves Assis wrote: > 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 >

[PATCH v3 1/2] merge-recursive: option to disable renames

2016-02-16 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 --- Documentation/merge-strategies.txt | 6 ++ merge-recursive.c | 7 +++