Re: [PATCH v8 8/8] notes: teach git-notes about notes..mergeStrategy option

2015-08-17 Thread Jacob Keller
Hi, On Mon, Aug 17, 2015 at 6:21 AM, Johan Herland wrote: > Allow me to suggest a different wording, somewhat inspired by the > branch..* documentation... > > On Mon, Aug 17, 2015 at 10:46 AM, Jacob Keller > wrote: >> From: Jacob Keller >> >> Add new option "notes..mergeStrategy" option which

Re: [PATCH v8 8/8] notes: teach git-notes about notes..mergeStrategy option

2015-08-17 Thread Johan Herland
Allow me to suggest a different wording, somewhat inspired by the branch..* documentation... On Mon, Aug 17, 2015 at 10:46 AM, Jacob Keller wrote: > From: Jacob Keller > > Add new option "notes..mergeStrategy" option which specifies the merge > strategy for merging into a given notes ref. Add n

[PATCH v8 8/8] notes: teach git-notes about notes..mergeStrategy option

2015-08-17 Thread Jacob Keller
From: Jacob Keller Add new option "notes..mergeStrategy" option which specifies the merge strategy for merging into a given notes ref. This option enables selection of merge strategy for particular notes refs, rather than all notes ref merges, as user may not want cat_sort_uniq for all refs, but