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, 08:41 UTC
Message-ID
<8d53e6220907230141l62dd1830g15ca811d5b009f2f@mail.gmail.com>
In-Reply-To
<8d53e6220907210542p4c989f3av2b57202fdd2db1f5@mail.gmail.com>
I'm replying to myself.... for the archives :-)

On Tue, Jul 21, 2009 at 2:42 PM, Martin Pirker<git.collector@gmail.com> wrote: [....]

>Any good idea on how to automagically script these cherry-picking?
tag identical content point in different branches:
 git tag tag1 commitx
 git tag tag2 commity
get list of newer commits:
 git rev-list tag1^..head1
 git rev-list tag2^..head2

compare content of commits via: git diff --exit-code commit1 commit2

...and cherry-pick resulting list from one side to the other

Git is an amazing toolbox :-) Martin

Previous: Martin PirkerNext: Pierre Habouzit
Message 2 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.