Re: [PATCH] merge-ll: expose revision names to custom drivers

From: Kristoffer Haugsbakk <code@khaugsbakk.name>
Date: Jan 18, 2024, 15:25 UTC
Message-ID: <549875d6-b9a8-4b0d-8eaf-e12b72a20e16@app.fastmail.com>
In-Reply-To: <pull.1648.git.git.1705587974840.gitgitgadget@gmail.com>

Hi

Show 8 quoted lines

> are working on, so that the merge conflict markers they introduce
> can refer to those revisions. The placeholders '%S', '%X' and '%Y'
> are introduced to this end.
>
> CC: Junio C Hamano <gitster@pobox.com>
>
> Signed-off-by: Antonin Delpeuch <antonin@delpeuch.eu>
> ---

This is gitgitgadget but `git send-email` would probably not pick up the CC here since it is not part of the trailer section (because there is a blank line between the CC line and the signed-off-by line). Maybe gitgitgadget works the same way. Also the space between `CC:` and the value is a no-break space but I don’t know if that matters.[1]

(Also see [2] for what it’s worth.)

† 1: On Linux at least this often happens by accident by pressing AltGr+Space. 🔗 2: https://lore.kernel.org/git/xmqqttwzded6.fsf@gitster.g/

-- 
Kristoffer Haugsbakk