On Tue, Apr 24, 2018 at 10:11 AM, Ben Peart <Ben.Peart@xxxxxxxxxxxxx> wrote: > Add the ability to control rename detection for merge via a config setting. Sweet, thanks for including the documentation updates. I lean towards the side of the argument that says that since merge.renameLimit inherits from diff.renameLimit, merge.renames should inherit default value from diff.renames (allow people to not have to repeat themselves as much if they want to use the same rename settings for all cases). Sounds like you and Johannes disagree. I don't feel super strongly about this item, but it'd probably be good to get some other git folks' opinions on this particular point. Other than that unresolved question, and the separate one about whether to go with a different option instead (e.g. merge.defaultStrategy), as being discussed elsewhere in this thread, the patch looks good to me.
