From: Martin Pirker <git.collector@gmail.com>
Date: Thu, 23 Jul 2009 08:41:37 GMT
Subject: Re: synchronizing 2 heterogenous branches by cherry-pick
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