From: Pierre Habouzit <madcoder@madism.org>
To: Martin Pirker <git.collector@gmail.com>
Cc: git@vger.kernel.org
Subject: Re: synchronizing 2 heterogenous branches by cherry-pick
Date: Thu, 23 Jul 2009 10:51:25 +0200 [thread overview]
Message-ID: <20090723085125.GL4750@laphroaig.corp> (raw)
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<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
Or use git cherry
--
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
next prev parent reply other threads:[~2009-07-23 8:51 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-07-21 12:42 synchronizing 2 heterogenous branches by cherry-pick Martin Pirker
2009-07-23 8:41 ` Martin Pirker
2009-07-23 8:51 ` Pierre Habouzit [this message]
2009-07-23 9:24 ` Martin Pirker
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20090723085125.GL4750@laphroaig.corp \
--to=madcoder@madism.org \
--cc=git.collector@gmail.com \
--cc=git@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).