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

Re: [PATCH] rebase -m: skip cherry-picked commits more reliably

From
Martin von Zweigbergk <martin.von.zweigbergk@gmail.com>
Date
Nov 24, 2010, 06:53 UTC
Message-ID
<alpine.DEB.1.10.1011240746030.17721@debian>
In-Reply-To
<alpine.DEB.1.10.1011232156510.17721@debian>
On Tue, 23 Nov 2010, Martin von Zweigbergk wrote:
> What I think we really want to do is to remove any patches in
> upstream..branch that also exist in branch..onto. I don't know how to
> do that efficiently, though. (And am I even right about it?)

To try to answer my own question, would the lines prefixed with a plus in the output of 'git cherry $onto $branch $(git merge-base $upstream $branch)' work?

/Martin
Previous: Martin von Zweigbergk
Message 3 of 3 in “rebase -m: skip cherry-picked commits more reliably”
  1. rebase -m: skip cherry-picked commits more reliablyKnut Franke, Nov 22, 2010
  2. Martin von ZweigbergkNov 23, 2010
  3. Martin von ZweigbergkNov 24, 2010

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.