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

Re: synchronizing 2 heterogenous branches by cherry-pick

From
MPMartin Pirker <git.collector@gmail.com>
Date
Jul 23, 2009, 09:24 UTC
Message-ID
<8d53e6220907230224t1ceddf31ic69bfbed84c851f@mail.gmail.com>
In-Reply-To
<20090723085125.GL4750@laphroaig.corp>
On Thu, Jul 23, 2009 at 10:51 AM, Pierre Habouzit<madcoder@madism.org> wrote:
> Or use git cherry

I tried, but I was under the impression git patch-id also hashes the commit message - or I got something else typed wrong 'cause it didn't seem to work :-/

You are right, the solution is:
 git cherry head1 head2 tag2
 git cherry head2 head1 tag1
and cherry-pick all lines prefixed with + to the other branch.

Thanks, Martin

Previous: Pierre Habouzit
Message 4 of 4 in “synchronizing 2 heterogenous branches by cherry-pick”
  1. Martin PirkerJul 21, 2009
  2. Martin PirkerJul 23, 2009
  3. Pierre HabouzitJul 23, 2009
  4. Martin PirkerJul 23, 2009

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.