git/list[1] front-page[2] threads[3] people[4] search[5] about
 

Re: Symmetric of rebase / more intelligent cherry-pick

From
Junio C Hamano <gitster@pobox.com>
Date
Oct 11, 2011, 21:28 UTC
Message-ID
<7vty7fdxql.fsf@alter.siamese.dyndns.org>
In-Reply-To
<7v8vorfhhu.fsf@alter.siamese.dyndns.org>
Junio C Hamano <gitster@pobox.com> writes:
Show 12 quoted lines
> Lionel Elie Mamane <lionel@mamane.lu> writes:
>
>> git cherry-pick ..UPSTREAM
>> *nearly* does what I want, except that it lacks rebase's intelligence
>> of skipping commits that do the same textual changes as a commit
>> already in the current branch.
>
> I think in the longer term "--ignore-if-in-upstream" that is known only to
> format-patch, which is the true source the intelligence of rebase you
> observed comes from, should be factored out into a helper function that
> can be used to filter output from get_revision() in other commands, or
> perhaps get_revision() itself might want to learn it.

We actually have half of that filtering in "--cherry-pick" that was introduced in d7a17ca (git-log --cherry-pick A...B, 2007-04-09).

Perhaps the recent cherry-pick that allows multiple commits to be picked should use that option (i.e. a "log --cherry-pick --right-only ..@{u}" equivalent) when coming up with which commits to apply?

Previous: Junio C HamanoNext: Jonathan Nieder
Message 3 of 4 in “Symmetric of rebase / more intelligent cherry-pick”
  1. Lionel Elie MamaneOct 11, 2011
  2. Junio C HamanoOct 11, 2011
  3. Junio C HamanoOct 11, 2011
  4. Jonathan NiederOct 11, 2011

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.