From: Martin Pirker <git.collector@gmail.com>
To: Pierre Habouzit <madcoder@madism.org>
Cc: git@vger.kernel.org
Subject: Re: synchronizing 2 heterogenous branches by cherry-pick
Date: Thu, 23 Jul 2009 11:24:33 +0200 [thread overview]
Message-ID: <8d53e6220907230224t1ceddf31ic69bfbed84c851f@mail.gmail.com> (raw)
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
prev parent reply other threads:[~2009-07-23 9:24 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
2009-07-23 9:24 ` Martin Pirker [this message]
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=8d53e6220907230224t1ceddf31ic69bfbed84c851f@mail.gmail.com \
--to=git.collector@gmail.com \
--cc=git@vger.kernel.org \
--cc=madcoder@madism.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).