Git development
 help / color / mirror / Atom feed
From: Junio C Hamano <gitster@pobox.com>
To: Phillip Wood <phillip.wood123@gmail.com>
Cc: Jeff King <peff@peff.net>,  Trevor Gross <tg@trevorgross.com>,
	git@vger.kernel.org,  Stefan Haller <lists@haller-berlin.de>,
	 Derrick Stolee <stolee@gmail.com>,
	 Phillip Wood <phillip.wood@dunelm.org.uk>
Subject: Re: [PATCH] rebase -i: introduce `pick -x` to add "cherry picked from commit ..."
Date: Mon, 06 Jul 2026 13:24:21 -0700	[thread overview]
Message-ID: <xmqqcxwzamtm.fsf@gitster.g> (raw)
In-Reply-To: <5d238e0d-18ba-429a-a9a4-a3988b00e1e1@gmail.com> (Phillip Wood's message of "Mon, 6 Jul 2026 11:08:18 +0100")

Phillip Wood <phillip.wood123@gmail.com> writes:

>> Usually a rebase is about rewriting the commits on a new base so that
>> you can throw away the old ones. And that's why git-rebase generally
>> rewrites the branch you're on, and replaces those old commits. So adding
>> a "cherry-picked from..." annotation doesn't make sense there; nobody
>> would have those old commits!
>
> Exactly

;-)  

Whew.  Briefly I wondered if I were the only one who felt 'rebase'
and 'cherry-pick' serve two different purposes and need to behave
differently, e.g., with respect to how notes on old commits are
dealt with.

> On a slight tangent I've sometimes wanted to be able to do
>
> 	git cherry-pick --exec 'make test' some commits

Yes, I agree that is something quite handy.

Thanks.

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

Thread overview: 8+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2026-07-05 14:09 [PATCH] rebase -i: introduce `pick -x` to add "cherry picked from commit ..." Trevor Gross
2026-07-05 18:58 ` Junio C Hamano
2026-07-05 22:23   ` Matt Hunter
2026-07-05 20:52 ` Junio C Hamano
2026-07-06  0:24 ` Jeff King
2026-07-06 10:08   ` Phillip Wood
2026-07-06 20:24     ` Junio C Hamano [this message]
2026-07-07  4:27     ` Jeff King

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=xmqqcxwzamtm.fsf@gitster.g \
    --to=gitster@pobox.com \
    --cc=git@vger.kernel.org \
    --cc=lists@haller-berlin.de \
    --cc=peff@peff.net \
    --cc=phillip.wood123@gmail.com \
    --cc=phillip.wood@dunelm.org.uk \
    --cc=stolee@gmail.com \
    --cc=tg@trevorgross.com \
    /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