From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 17 Aug 2015 19:35:28 GMT
Subject: Re: [PATCH v8 4/8] notes: allow use of the "rewrite" terminology for merge strategies
Message-ID: <xmqqoai5d7y7.fsf@gitster.dls.corp.google.com>
In-Reply-To: <CALKQrgfLzWdRxC5saBXJ_-iKmVDfs+mBfDKKrSU2-tP7eO5+Zg@mail.gmail.com>

Johan Herland <johan@herland.net> writes:

> On Mon, Aug 17, 2015 at 10:46 AM, Jacob Keller <jacob.e.keller@intel.com> wrote:
>> From: Jacob Keller <jacob.keller@gmail.com>
>>
>> notes-merge.c already re-uses the same functions for the automatic merge
>> strategies used by the rewrite functionality. Teach the -s/--strategy
>> option how to interpret the equivalent rewrite terminology for
>> consistency.
>
> I'm somewhat negative to this patch. IMHO, adding the rewrite modes as
> merge strategy synonyms adds no benefit - only potential confusion -
> to the existing merge strategies.  ...
> ... By committing to these synonyms now, you might
> actually be making things harder for the future author: once the
> synonyms are part of the user-visible and documented interface, they
> cannot easily be removed/changed again.

OK.  Thanks.