Re: synchronizing 2 heterogenous branches by cherry-pick

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



I'm replying to myself.... for the archives :-)

On Tue, Jul 21, 2009 at 2:42 PM, Martin Pirker<git.collector@xxxxxxxxx> 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
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html

[Index of Archives]     [Linux Kernel Development]     [Gcc Help]     [IETF Annouce]     [DCCP]     [Netdev]     [Networking]     [Security]     [V4L]     [Bugtraq]     [Yosemite]     [MIPS Linux]     [ARM Linux]     [Linux Security]     [Linux RAID]     [Linux SCSI]     [Fedora Users]