Re: synchronizing 2 heterogenous branches by cherry-pick
On Thu, Jul 23, 2009 at 10:41:37AM +0200, Martin Pirker wrote:
Show 18 quoted lines
> 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
--
Intersec <http://www.intersec.com>
Pierre Habouzit <pierre.habouzit@intersec.com>
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