git/list[1] front-page[2] threads[3] people[4] search[5] about
 

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

From
Jacob Keller <jacob.keller@gmail.com>
Date
Aug 17, 2015, 18:25 UTC
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:
Show 25 quoted lines
> 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

Previous: Johan Herland
Message 14 of 14 in “implement notes.mergeStrategy option”
  1. 0/8 implement notes.mergeStrategy optionJacob Keller, Aug 17, 2015
  2. 1/8 notes: document cat_sort_uniq rewriteModeJacob Keller, Aug 17, 2015
  3. 2/8 notes: extract enum notes_merge_strategy to notes-utils.hJacob Keller, Aug 17, 2015
  4. 3/8 note: extract parse_notes_merge_strategy to notes-utilsJacob Keller, Aug 17, 2015
  5. 4/8 notes: allow use of the "rewrite" terminology for merge strategiesJacob Keller, Aug 17, 2015
  6. Johan HerlandAug 17, 2015
  7. Jacob KellerAug 17, 2015
  8. Junio C HamanoAug 17, 2015
  9. 5/8 notes: implement parse_combine_rewrite_fn using parse_notes_merge_strategyJacob Keller, Aug 17, 2015
  10. 6/8 notes: add tests for --commit/--abort/--strategy exclusivityJacob Keller, Aug 17, 2015
  11. 7/8 notes: add notes.mergeStrategy option to select default strategyJacob Keller, Aug 17, 2015
  12. 8/8 notes: teach git-notes about notes.<ref>.mergeStrategy optionJacob Keller, Aug 17, 2015
  13. Johan HerlandAug 17, 2015
  14. Jacob KellerAug 17, 2015

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.