git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Junio C Hamano <gitster@pobox.com>
To: "Antonin Delpeuch via GitGitGadget" <gitgitgadget@gmail.com>
Cc: git@vger.kernel.org,  Phillip Wood <phillip.wood123@gmail.com>,
	 Antonin Delpeuch <antonin@delpeuch.eu>
Subject: Re: [PATCH v4] merge-ll: expose revision names to custom drivers
Date: Wed, 24 Jan 2024 13:17:04 -0800	[thread overview]
Message-ID: <xmqqfrymbfe7.fsf@gitster.g> (raw)
In-Reply-To: <pull.1648.v4.git.git.1706126951879.gitgitgadget@gmail.com> (Antonin Delpeuch via GitGitGadget's message of "Wed, 24 Jan 2024 20:09:11 +0000")

"Antonin Delpeuch via GitGitGadget" <gitgitgadget@gmail.com> writes:

> From: Antonin Delpeuch <antonin@delpeuch.eu>
>
> Custom merge drivers need access to the names of the revisions they
> 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.
>
> Signed-off-by: Antonin Delpeuch <antonin@delpeuch.eu>
> ---

This looks all good.

Let's declare a victory and merge it down to 'next' soonish.

Thanks for sticking to the topic.

      reply	other threads:[~2024-01-24 21:17 UTC|newest]

Thread overview: 15+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2024-01-18 14:26 [PATCH] merge-ll: expose revision names to custom drivers Antonin Delpeuch via GitGitGadget
2024-01-18 15:25 ` Kristoffer Haugsbakk
2024-01-18 15:42   ` Antonin Delpeuch
2024-01-18 15:43 ` [PATCH v2] " Antonin Delpeuch via GitGitGadget
2024-01-18 20:16   ` Junio C Hamano
2024-01-18 20:56     ` Antonin Delpeuch
2024-01-18 22:09   ` [PATCH v3] " Antonin Delpeuch via GitGitGadget
2024-01-19 20:02     ` Antonin Delpeuch
2024-01-20 17:25       ` Junio C Hamano
2024-01-20 14:13     ` Phillip Wood
2024-01-20 17:37       ` Junio C Hamano
2024-01-20 18:23         ` Phillip Wood
2024-01-20 22:49       ` Junio C Hamano
2024-01-24 20:09     ` [PATCH v4] " Antonin Delpeuch via GitGitGadget
2024-01-24 21:17       ` Junio C Hamano [this message]

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=xmqqfrymbfe7.fsf@gitster.g \
    --to=gitster@pobox.com \
    --cc=antonin@delpeuch.eu \
    --cc=git@vger.kernel.org \
    --cc=gitgitgadget@gmail.com \
    --cc=phillip.wood123@gmail.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).