From: Pierre Habouzit Date: Thu, 23 Jul 2009 08:51:25 GMT Subject: Re: synchronizing 2 heterogenous branches by cherry-pick Message-ID: <20090723085125.GL4750@laphroaig.corp> In-Reply-To: <8d53e6220907230141l62dd1830g15ca811d5b009f2f@mail.gmail.com> On Thu, Jul 23, 2009 at 10:41:37AM +0200, Martin Pirker wrote: > I'm replying to myself.... for the archives :-) > > On Tue, Jul 21, 2009 at 2:42 PM, Martin Pirker 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 Or use git cherry -- Intersec Pierre Habouzit Tél : +33 (0)1 5570 3346 Mob : +33 (0)6 1636 8131 Fax : +33 (0)1 5570 3332 37 Rue Pierre Lhomme 92400 Courbevoie