From: Junio C Hamano <firstname.lastname@example.org>
To: Jeff King <email@example.com>
Cc: Wang Yugui <firstname.lastname@example.org>, email@example.com
Subject: Re: [PATCH] docs/format-patch: mention handling of merges
Date: Mon, 22 Feb 2021 17:24:16 -0800 [thread overview]
Message-ID: <firstname.lastname@example.org> (raw)
In-Reply-To: <YDRA6RJdnFne2EBw@coredump.intra.peff.net> (Jeff King's message of "Mon, 22 Feb 2021 18:40:25 -0500")
Jeff King <email@example.com> writes:
> That seems worse to me, because "it is impossible" implies that this
> can never be changed. But I don't think that's true. We might one day
> output something useful for merges.
Fair enough. You are more optimistic than I am ;-)
> I think one could argue that any merge information (including conflict
> resolution) works against the root notion of format-patch, which is a
> set of changes that can be applied on a range of basesa.
That's true and it was the primary motive for omiting merges.
> But even that I
> would be hesitant to commit to (since --base exists now).
I am not quite sure what --base has to throw into the equation. The
information --base gives is often useful when I want to learn where
the patches were taken from, but that does not restrict where the
patches are actually applied to in any meaningful way (iow, "on a
range of bases" part is not affected).
next prev parent reply other threads:[~2021-02-23 1:27 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-02-22 13:16 git format-patch lost the last part when branch merge Wang Yugui
2021-02-22 22:57 ` Jeff King
2021-02-22 23:08 ` [PATCH] docs/format-patch: mention handling of merges Jeff King
2021-02-22 23:31 ` Junio C Hamano
2021-02-22 23:40 ` Jeff King
2021-02-23 1:24 ` Junio C Hamano [this message]
2021-02-23 1:48 ` Jeff King
2021-02-22 23:25 ` git format-patch lost the last part when branch merge Junio C Hamano
2021-02-24 4:24 ` Elijah Newren
2021-02-24 4:50 ` Jeff King
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:
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
* 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.
Code repositories for project(s) associated with this public inbox
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 read-only IMAP folder(s) and NNTP newsgroup(s).