All of lore.kernel.org
 help / color / mirror / Atom feed
From: Junio C Hamano <gitster@pobox.com>
To: Patrick Steinhardt <ps@pks.im>
Cc: git@vger.kernel.org
Subject: Re: [PATCH 0/7] refs: remove use of `the_repository`
Date: Fri, 10 Jul 2026 13:24:18 -0700	[thread overview]
Message-ID: <xmqqa4ryd24t.fsf@gitster.g> (raw)
In-Reply-To: <xmqqo6gedbq2.fsf@gitster.g> (Junio C. Hamano's message of "Fri, 10 Jul 2026 09:57:09 -0700")

Junio C Hamano <gitster@pobox.com> writes:

> It is more than probable that it was what happened.  Will retry the
> merge during the integration run I'll make later today.
>
> Thanks.

And indeed, I had a mismerge.

Thanks, the topic is back in.


  reply	other threads:[~2026-07-10 20:24 UTC|newest]

Thread overview: 16+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2026-07-09  8:29 [PATCH 0/7] refs: remove use of `the_repository` Patrick Steinhardt
2026-07-09  8:29 ` [PATCH 1/7] refs/packed: de-globalize handling of "core.packedRefsTimeout" Patrick Steinhardt
2026-07-09 18:52   ` Junio C Hamano
2026-07-10  5:56     ` Patrick Steinhardt
2026-07-09  8:29 ` [PATCH 2/7] refs/packed: drop `USE_THE_REPOSITORY_VARIABLE` Patrick Steinhardt
2026-07-09  8:29 ` [PATCH 3/7] refs/files: " Patrick Steinhardt
2026-07-09  8:29 ` [PATCH 4/7] worktree: refactor code to use available repositories Patrick Steinhardt
2026-07-09  8:29 ` [PATCH 5/7] worktree: pass repository to file-local functions Patrick Steinhardt
2026-07-09  8:29 ` [PATCH 6/7] worktree: pass repository to public functions Patrick Steinhardt
2026-07-09  8:29 ` [PATCH 7/7] refs: remove remaining uses of `the_repository` Patrick Steinhardt
2026-07-09 20:39 ` [PATCH 0/7] refs: remove use " Junio C Hamano
2026-07-10  5:56   ` Patrick Steinhardt
2026-07-10  6:14     ` Patrick Steinhardt
2026-07-10 16:57       ` Junio C Hamano
2026-07-10 20:24         ` Junio C Hamano [this message]
2026-07-10 14:48     ` Junio C Hamano

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=xmqqa4ryd24t.fsf@gitster.g \
    --to=gitster@pobox.com \
    --cc=git@vger.kernel.org \
    --cc=ps@pks.im \
    /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.