Thread (1 message) 1 message, 1 author, 2016-06-15

Re: [PATCH v8 4/8] notes: allow use of the "rewrite" terminology for merge strategies

From: Junio C Hamano <hidden>
Date: 2016-06-15 23:06:13

Johan Herland [off-list ref] writes:
On Mon, Aug 17, 2015 at 10:46 AM, Jacob Keller [off-list ref] wrote:
quoted
From: Jacob Keller <redacted>

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.
Keyboard shortcuts
hback out one level
jnext message in thread
kprevious message in thread
ldrill in
Escclose help / fold thread tree
?toggle this help