Johan Herland <johan@xxxxxxxxxxx> writes: > On Mon, Aug 17, 2015 at 10:46 AM, Jacob Keller <jacob.e.keller@xxxxxxxxx> wrote: >> From: Jacob Keller <jacob.keller@xxxxxxxxx> >> >> 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. -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html