Git development
 help / color / mirror / Atom feed
From: Miklos Vajna <vmiklos@collabora.com>
To: Junio C Hamano <gitster@pobox.com>
Cc: Jeff King <peff@peff.net>, git@vger.kernel.org
Subject: Re: [PATCH v4] log: improve --follow following renames for non-linear history
Date: Tue, 23 Jun 2026 13:30:33 +0200	[thread overview]
Message-ID: <ajpuWSUiQ6CRV2Kv@collabora.com> (raw)
In-Reply-To: <xmqq1pdy4udg.fsf@gitster.g>

Hi Junio,

On Mon, Jun 22, 2026 at 05:44:43AM -0700, Junio C Hamano <gitster@pobox.com> wrote:
> went on in this patch would count), but as long as the resolution
> that is in my tree (as a part of 'seen') exactly matches what your
> update contains (meaning: rerere will do the same correct resolution
> when the topic gets merged to 'master' anyway) and the conflict is
> trivial to resolve by hand for others

I see, I'll keep that in mind for the future.

Thanks,

Miklos

  reply	other threads:[~2026-06-23 11:30 UTC|newest]

Thread overview: 18+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2026-05-12  7:21 [PATCH] log: let --follow follow renames in merge commits Miklos Vajna
2026-05-19  6:17 ` Miklos Vajna
2026-05-19  6:37   ` Junio C Hamano
2026-05-19  8:14     ` Junio C Hamano
2026-06-08  6:35       ` [PATCH] log: improve --follow following renames for non-linear history Miklos Vajna
2026-06-08 15:10         ` Junio C Hamano
2026-06-11  6:18           ` [PATCH v2] " Miklos Vajna
2026-06-11 22:32             ` Junio C Hamano
2026-06-15  6:22               ` [PATCH v3] " Miklos Vajna
2026-06-22  6:23                 ` [PATCH v4] " Miklos Vajna
2026-06-22 12:44                   ` Junio C Hamano
2026-06-23 11:30                     ` Miklos Vajna [this message]
2026-06-12 20:10             ` [PATCH v2] " Junio C Hamano
2026-05-20 13:28     ` [PATCH] log: let --follow follow renames in merge commits Miklos Vajna
2026-05-22  5:43       ` Jeff King
2026-05-23  6:04         ` [PATCH] log: improve --follow following " Miklos Vajna
2026-05-30  6:28           ` Miklos Vajna
2026-06-04 12:20             ` Miklos Vajna

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=ajpuWSUiQ6CRV2Kv@collabora.com \
    --to=vmiklos@collabora.com \
    --cc=git@vger.kernel.org \
    --cc=gitster@pobox.com \
    --cc=peff@peff.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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox