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

Re: [RFC PATCH gentoolkit] bin: Add merge-driver-ekeyword

From
Junio C Hamano <gitster@pobox.com>
Date
Dec 23, 2020, 19:46 UTC
Message-ID
<xmqqo8ik8fvf.fsf@gitster.c.googlers.com>
In-Reply-To
<b2adb41b-b2d2-fecf-3a93-7eb3f1f2247d@drbeat.li>
Beat Bolli <dev+git@drbeat.li> writes:
Show 18 quoted lines
> You can probably put each of the keywords on a separate line:
>
> KEYWORDS="
> ~alpha
> ~amd64
> ~arm
> ~arm64
> ~hppa
> ~ia64
> ~mips
> ~ppc
> ~ppc64
> ~riscv
> ~s390
> ~sparc~x86
> "
>
> The shell should handle both forms about the same.

I agree that it is a more practical approach than writing an one-off merge driver.

Previous: Beat BolliNext: Junio C Hamano
Message 3 of 6 in “Re: [RFC PATCH gentoolkit] bin: Add merge-driver-ekeyword”
  1. Matt TurnerDec 22, 2020
  2. Beat BolliDec 23, 2020
  3. Junio C HamanoDec 23, 2020
  4. Junio C HamanoDec 23, 2020
  5. Matt TurnerDec 24, 2020
  6. Junio C HamanoDec 24, 2020

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.