Re: [PATCH v2 0/2] add additional config settings for merge

2018-04-25 Thread Junio C Hamano
Ben Peart writes: > To be clear, this documentation change isn't trying to document any > changes to the code or behavior - it is just an attempt to clarify > what the existing behavior is. Yeah, I know, and I do think the new text is a good first step in the right direction; I merely was trying

Re: [PATCH v2 0/2] add additional config settings for merge

2018-04-25 Thread Ben Peart
On 4/24/2018 8:13 PM, Junio C Hamano wrote: Ben Peart writes: diff.renameLimit:: The number of files to consider when performing the copy/rename - detection; equivalent to the 'git diff' option `-l`. + detection; equivalent to the 'git diff' option `-l`. This setting +

Re: [PATCH v2 0/2] add additional config settings for merge

2018-04-24 Thread Junio C Hamano
Ben Peart writes: > diff.renameLimit:: > The number of files to consider when performing the copy/rename > - detection; equivalent to the 'git diff' option `-l`. > + detection; equivalent to the 'git diff' option `-l`. This setting > + has no effect if rename detection is turne

[PATCH v2 0/2] add additional config settings for merge

2018-04-24 Thread Ben Peart
Updated in response to feedback. Mostly documentation changes but the diffstat at the end of the merge (if on) now honors the new merge.rename setting as well. Base Ref: master Web-Diff: https://github.com/benpeart/git/commit/653bfe6e01 Checkout: git fetch https://github.com/benpeart/git merge-op