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

Johan Herland writes: > On Mon, Aug 17, 2015 at 10:46 AM, Jacob Keller > wrote: >> From: Jacob Keller >> >> 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 equivalen

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

Hi, On Mon, Aug 17, 2015 at 5:54 AM, Johan Herland wrote: > On Mon, Aug 17, 2015 at 10:46 AM, Jacob Keller > wrote: >> From: Jacob Keller >> >> notes-merge.c already re-uses the same functions for the automatic merge >> strategies used by the rewrite functionality. Teach the -s/--strategy >> o

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

On Mon, Aug 17, 2015 at 10:46 AM, Jacob Keller wrote: > From: Jacob Keller > > 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 > consis

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

From: Jacob Keller 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. Add tests for the new synonyms. Teaching rewrite how to u