Re: [PATCH v4 2/3] merge: Add merge.renames config setting

2018-05-03 Thread Junio C Hamano
Ben Peart writes: I'd downcase the verb on the subject. > Add the ability to control rename detection for merge via a config setting. > This setting behaves the same and defaults to the value of diff.renames but > only > applies to merge. > > Reviewed-by: Johannes

[PATCH v4 2/3] merge: Add merge.renames config setting

2018-05-02 Thread Ben Peart
Add the ability to control rename detection for merge via a config setting. This setting behaves the same and defaults to the value of diff.renames but only applies to merge. Reviewed-by: Johannes Schindelin Helped-by: Elijah Newren Signed-off-by: