All of lore.kernel.org
 help / color / mirror / Atom feed
From: Junio C Hamano <gitster@pobox.com>
To: Elijah Newren <newren@gmail.com>
Cc: "brian m. carlson" <sandals@crustytoothpaste.net>,
	 Matt Cree <matt.cree@gearset.com>,
	 git@vger.kernel.org
Subject: Re: Unexpected git merge exit code when killing merge driver during ancestor merge
Date: Thu, 13 Jun 2024 15:22:53 -0700	[thread overview]
Message-ID: <xmqqo784jxdu.fsf@gitster.g> (raw)
In-Reply-To: <CABPp-BFrcNLA-714gw+JogtAQLhmcs_sLnkkaBiGERF+riwZLQ@mail.gmail.com> (Elijah Newren's message of "Thu, 13 Jun 2024 13:50:04 -0700")

Elijah Newren <newren@gmail.com> writes:

> Again, sorry for the delay.  For those reading through the archives, I
> posted a fix to this and a few other issues found while investigating
> this problem over here:
> https://lore.kernel.org/git/pull.1748.git.1718310307.gitgitgadget@gmail.com/

Thanks for a pleasant read.  It mostly looked fine.  Queued.


  reply	other threads:[~2024-06-13 22:23 UTC|newest]

Thread overview: 6+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2024-04-04 16:16 Unexpected git merge exit code when killing merge driver during ancestor merge Matt Cree
2024-04-05 20:04 ` brian m. carlson
2024-05-09  5:03   ` Elijah Newren
2024-06-13 20:50     ` Elijah Newren
2024-06-13 22:22       ` Junio C Hamano [this message]
  -- strict thread matches above, loose matches on Subject: below --
2024-05-08 18:14 Matt Cree

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=xmqqo784jxdu.fsf@gitster.g \
    --to=gitster@pobox.com \
    --cc=git@vger.kernel.org \
    --cc=matt.cree@gearset.com \
    --cc=newren@gmail.com \
    --cc=sandals@crustytoothpaste.net \
    /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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.