All of lore.kernel.org
 help / color / mirror / Atom feed
From: Oswald Buddenhagen <oswald.buddenhagen@gmx.de>
To: Junio C Hamano <gitster@pobox.com>
Cc: Rasmus Villemoes <ravi@prevas.dk>, git@vger.kernel.org
Subject: Re: customizing "cherry picked from commit abcd" comment
Date: Wed, 1 Oct 2025 13:41:10 +0200	[thread overview]
Message-ID: <aN0TVmEMXOyDZEwR@ugly.lan> (raw)
In-Reply-To: <xmqq5xd054r2.fsf@gitster.g>

On Tue, Sep 30, 2025 at 08:39:29AM -0700, Junio C Hamano wrote:
>Oswald Buddenhagen <oswald.buddenhagen@gmx.de> writes:
>> 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.
>
>I do not know what "an ideological commitment" refers to in this
>context,
>
it refers to the general notion "don't cherry-pick, but merge", which 
relegates cherry-picks to being a 2nd-class workflow.

>The intention was for the original commit to be also be public and
>in the same project (e.g., you cherry-pick a commit from the main
>branch developing towards the next great version, down to a
>maintenance branch for the previous release), [...]
>
yes, exactly. this trunk-first development model is quite common, and 
has been strongly pushed by some big players in recent years. this makes 
it really surprising that git still does not provide well-integrated 
support for it out-of-the-box.

based on your response i conclude that you would actually welcome such a 
thing very much, but the impression of a bias against cherry-picks is 
probably not unique to myself, and if so, it likely contributed to the 
persistence of the status quo.

  reply	other threads:[~2025-10-01 11:41 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
2025-09-30 15:39   ` Junio C Hamano
2025-10-01 11:41     ` Oswald Buddenhagen [this message]
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=aN0TVmEMXOyDZEwR@ugly.lan \
    --to=oswald.buddenhagen@gmx.de \
    --cc=git@vger.kernel.org \
    --cc=gitster@pobox.com \
    --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.