git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Junio C Hamano <gitster@pobox.com>
To: Seth House <seth@eseth.com>
Cc: Philippe Blain <levraiphilippeblain@gmail.com>,
	git@vger.kernel.org, pudinha <rogi@skylittlesystem.org>,
	David Aguilar <davvid@gmail.com>
Subject: Re: [PATCH 0/1] mergetools/vimdiff: add vimdiff1 merge tool variant
Date: Fri, 26 Feb 2021 17:52:22 -0800	[thread overview]
Message-ID: <xmqqblc6qnu1.fsf@gitster.g> (raw)
In-Reply-To: <YDmFrd/zB4G93oHz@ellen.lan> (Seth House's message of "Fri, 26 Feb 2021 16:35:09 -0700")

Seth House <seth@eseth.com> writes:

> On Thu, Feb 25, 2021 at 06:04:53PM -0800, Junio C Hamano wrote:
>> Seth House <seth@eseth.com> writes:
>> > I'll roll those into this patch.
>> 
>> I'd rather see it as a completely separate patch.
>
> Ok, will do.
>
> Should I roll a v2 of this patch set to include David's tested-by tag
> even though there's no code changes?

I think that is exactly what we have on sh/mergetools-vimdiff1 topic
branch in 'next'.

    $ git fetch
    $ git show 'origin/next^{/^mergetools/vimdiff:}'

Thanks.


  reply	other threads:[~2021-02-27  1:53 UTC|newest]

Thread overview: 11+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-02-14  2:28 Seth House
2021-02-14  2:28 ` [PATCH 1/1] " Seth House
2021-02-16 18:38   ` Junio C Hamano
2021-02-23 18:55     ` David Aguilar
2021-02-25 16:02       ` Seth House
2021-02-25 18:45 ` [PATCH 0/1] " Philippe Blain
2021-02-26  0:29   ` Seth House
2021-02-26  2:04     ` Junio C Hamano
2021-02-26 23:35       ` Seth House
2021-02-27  1:52         ` Junio C Hamano [this message]
2021-02-27  2:17           ` Seth House

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=xmqqblc6qnu1.fsf@gitster.g \
    --to=gitster@pobox.com \
    --cc=davvid@gmail.com \
    --cc=git@vger.kernel.org \
    --cc=levraiphilippeblain@gmail.com \
    --cc=rogi@skylittlesystem.org \
    --cc=seth@eseth.com \
    --subject='Re: [PATCH 0/1] mergetools/vimdiff: add vimdiff1 merge tool variant' \
    /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

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).