From: Jacob Keller <jacob.keller@gmail.com>
Date: Mon, 17 Aug 2015 18:25:47 GMT
Subject: Re: [PATCH v8 8/8] notes: teach git-notes about notes.<ref>.mergeStrategy option
Message-ID: <CA+P7+xok1z+d2RAduPQhs6=a+SrX+jKGjKHsamUEA-ih7qBemQ@mail.gmail.com>
In-Reply-To: <CALKQrgeBVfkWOPZYJLnLqJiBPG5XR++G2Mmma2tyc-kwZ5aW_A@mail.gmail.com>

Hi,

On Mon, Aug 17, 2015 at 6:21 AM, Johan Herland <johan@herland.net> wrote:
> Allow me to suggest a different wording, somewhat inspired by the
> branch.<name>.* documentation...
>
> On Mon, Aug 17, 2015 at 10:46 AM, Jacob Keller <jacob.e.keller@intel.com> wrote:
>> From: Jacob Keller <jacob.keller@gmail.com>
>>
>> Add new option "notes.<ref>.mergeStrategy" option which specifies the merge
>> strategy for merging into a given notes ref.
>
> Add new "notes.<name>.mergeStrategy" config, which specifies the merge
> strategy for notes merges into refs/notes/<name>.
>
>> 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
>> only some. Note that the <ref> is the local reference we are merging
>
> s/<ref>/<name>/
>
>> into, not the remote ref we merged from. The assumption is that users
>> will mostly want to configure separate local ref merge strategies rather
>> than strategies depending on which remote ref they merge from. Also,
>> notes.<ref>.merge overrides the general behavior as it is more specific.
>
> same here

Agreed, will fix in the next respin.

Regards,
Jake