From: Kristoffer Haugsbakk Date: Thu, 18 Jan 2024 15:25:25 GMT Subject: Re: [PATCH] merge-ll: expose revision names to custom drivers Message-ID: <549875d6-b9a8-4b0d-8eaf-e12b72a20e16@app.fastmail.com> In-Reply-To: Hi > 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 > > Signed-off-by: Antonin Delpeuch > --- 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