From: Oswald Buddenhagen <oswald.buddenhagen@gmx.de>
To: Rasmus Villemoes <ravi@prevas.dk>
Cc: git@vger.kernel.org
Subject: Re: customizing "cherry picked from commit abcd" comment
Date: Tue, 30 Sep 2025 12:11:30 +0200 [thread overview]
Message-ID: <aNus0ulSTb4rAYdF@ugly.lan> (raw)
In-Reply-To: <87v7l18nnt.fsf@prevas.dk>
On Mon, Sep 29, 2025 at 02:10:30PM +0200, Rasmus Villemoes wrote:
>This makes it easier, when porting to v+1, to know if that commit still
>needs to be cherry-picked or is already included, and also makes it
>obvious to anyone reading the current history to know the "upstream
>status" of that commit.
>
i sometimes customize this pseudo-footer as well, but it's usually
things like "(partially cherry-picked ...)" or "(... from
<repo>/<sha1>)", etc.
your particular use case would imo be better addressed by implementing
bi-directional linking between picked commits via a standardized
git-notes namespace.
the pseudo-trailer is really just a hack in the first place, and afaict
that status quo results from an ideological commitment against
cherry-picks during the early history of git. but it's really kinda
silly that subversion and perforce have better tracking of cherry-picks
to this date, even when it's their only way to do merges.
next prev parent reply other threads:[~2025-09-30 10:11 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-09-29 12:10 customizing "cherry picked from commit abcd" comment Rasmus Villemoes
2025-09-30 10:11 ` Oswald Buddenhagen [this message]
2025-09-30 15:39 ` Junio C Hamano
2025-10-01 11:41 ` Oswald Buddenhagen
2025-10-02 2:49 ` Junio C Hamano
2025-10-03 11:41 ` Oswald Buddenhagen
2025-09-30 15:17 ` brian m. carlson
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=aNus0ulSTb4rAYdF@ugly.lan \
--to=oswald.buddenhagen@gmx.de \
--cc=git@vger.kernel.org \
--cc=ravi@prevas.dk \
/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.