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