Re: [PATCH v1 1/2] merge: Add merge.renames config setting

Hi Elijah, On Tue, 24 Apr 2018, Elijah Newren wrote: > On Tue, Apr 24, 2018 at 4:58 AM, Johannes Schindelin > wrote: > > > > On Tue, 24 Apr 2018, Junio C Hamano wrote: > > > >> Yeah, but as opposed to passing "oh, let's see if we can get a > >> reasonable result

Re: [PATCH v1 1/2] merge: Add merge.renames config setting

Hi Dscho, On Tue, Apr 24, 2018 at 4:58 AM, Johannes Schindelin wrote: > Hi Junio, > > On Tue, 24 Apr 2018, Junio C Hamano wrote: > >> Yeah, but as opposed to passing "oh, let's see if we can get a >> reasonable result without rename detection just this time" from the

Re: [PATCH v1 1/2] merge: Add merge.renames config setting

On 4/23/2018 5:32 PM, Eckhard Maaß wrote: On Mon, Apr 23, 2018 at 09:15:09AM -0400, Ben Peart wrote: In commit 2a2ac926547 when merge.renamelimit was added, it was decided to have separate settings for merge and diff to give users the ability to control that behavior. In this particular

Re: [PATCH v1 1/2] merge: Add merge.renames config setting

Hi Junio, On Tue, 24 Apr 2018, Junio C Hamano wrote: > Ben Peart writes: > > >> I also had to wonder how "merge -s resolve" faired, if the project > >> is not interested in renamed paths at all. > >> > > > > To be clear, it isn't that we're not interested in detecting

Re: [PATCH v1 1/2] merge: Add merge.renames config setting

Ben Peart writes: >> I also had to wonder how "merge -s resolve" faired, if the project >> is not interested in renamed paths at all. >> > > To be clear, it isn't that we're not interested in detecting renamed > files and paths. We're just opposed to it taking an hour to

Re: [PATCH v1 1/2] merge: Add merge.renames config setting

On Mon, Apr 23, 2018 at 09:15:09AM -0400, Ben Peart wrote: > In commit 2a2ac926547 when merge.renamelimit was added, it was decided to > have separate settings for merge and diff to give users the ability to > control that behavior. In this particular case, it will default to the > value of

Re: [PATCH v1 1/2] merge: Add merge.renames config setting

On 4/21/2018 12:23 AM, Junio C Hamano wrote: Elijah Newren writes: +merge.renames:: + Whether and how Git detects renames. If set to "false", + rename detection is disabled. If set to "true", basic rename + detection is enabled. This is the default.

Re: [PATCH v1 1/2] merge: Add merge.renames config setting

On 4/20/2018 2:34 PM, Elijah Newren wrote: Hi Ben, On Fri, Apr 20, 2018 at 10:59 AM, Ben Peart wrote: On 4/20/2018 1:02 PM, Elijah Newren wrote: On Fri, Apr 20, 2018 at 6:36 AM, Ben Peart wrote: --- a/Documentation/merge-config.txt +++

Re: [PATCH v1 1/2] merge: Add merge.renames config setting

On 4/22/2018 8:07 AM, Eckhard Maaß wrote: On Fri, Apr 20, 2018 at 11:34:25AM -0700, Elijah Newren wrote: Sorry, I think I wasn't being clear. The documentation for the config options for e.g. diff.renameLimit, fetch.prune, log.abbrevCommit, and merge.ff all mention the equivalent command

Re: [PATCH v1 1/2] merge: Add merge.renames config setting

On 4/20/2018 1:26 PM, Elijah Newren wrote: On Fri, Apr 20, 2018 at 10:02 AM, Elijah Newren wrote: On Fri, Apr 20, 2018 at 6:36 AM, Ben Peart wrote: --- a/Documentation/merge-config.txt +++ b/Documentation/merge-config.txt @@ -37,6 +37,11 @@

Re: [PATCH v1 1/2] merge: Add merge.renames config setting

On Fri, Apr 20, 2018 at 11:34:25AM -0700, Elijah Newren wrote: > Sorry, I think I wasn't being clear. The documentation for the config > options for e.g. diff.renameLimit, fetch.prune, log.abbrevCommit, and > merge.ff all mention the equivalent command line parameters. Your > patch doesn't do

Re: [PATCH v1 1/2] merge: Add merge.renames config setting

Elijah Newren writes: +merge.renames:: + Whether and how Git detects renames. If set to "false", + rename detection is disabled. If set to "true", basic rename + detection is enabled. This is the default. >>> >>> >>> One can already

Re: [PATCH v1 1/2] merge: Add merge.renames config setting

Hi Ben, On Fri, Apr 20, 2018 at 10:59 AM, Ben Peart wrote: > > On 4/20/2018 1:02 PM, Elijah Newren wrote: >> >> On Fri, Apr 20, 2018 at 6:36 AM, Ben Peart >> wrote: >>> >>> --- a/Documentation/merge-config.txt >>> +++ b/Documentation/merge-config.txt

Re: [PATCH v1 1/2] merge: Add merge.renames config setting

On 4/20/2018 1:02 PM, Elijah Newren wrote: On Fri, Apr 20, 2018 at 6:36 AM, Ben Peart wrote: --- a/Documentation/merge-config.txt +++ b/Documentation/merge-config.txt @@ -37,6 +37,11 @@ merge.renameLimit:: during a merge; if not specified, defaults to the

Re: [PATCH v1 1/2] merge: Add merge.renames config setting

On Fri, Apr 20, 2018 at 10:02 AM, Elijah Newren wrote: > On Fri, Apr 20, 2018 at 6:36 AM, Ben Peart wrote: >> --- a/Documentation/merge-config.txt >> +++ b/Documentation/merge-config.txt >> @@ -37,6 +37,11 @@ merge.renameLimit:: >> during a

Re: [PATCH v1 1/2] merge: Add merge.renames config setting

On Fri, Apr 20, 2018 at 6:36 AM, Ben Peart wrote: > --- a/Documentation/merge-config.txt > +++ b/Documentation/merge-config.txt > @@ -37,6 +37,11 @@ merge.renameLimit:: > during a merge; if not specified, defaults to the value of > diff.renameLimit. > >

[PATCH v1 1/2] merge: Add merge.renames config setting

Add the ability to control rename detection for merge via a config setting. Reviewed-by: Johannes Schindelin Signed-off-by: Ben Peart --- Documentation/merge-config.txt | 5 + merge-recursive.c | 1 + 2 files changed, 6