From: Matt Turner <mattst88@gentoo.org>
To: gentoo-catalyst@lists.gentoo.org
Subject: Re: [gentoo-catalyst] rfc: merging catalyst git branches
Date: Mon, 25 Jun 2012 00:04:28 -0400 [thread overview]
Message-ID: <CAEdQ38E0AjT77vc4wXH88A-t4vV4wf=fRrmidikzoDeMVwFduA@mail.gmail.com> (raw)
In-Reply-To: <4FE7A3C2.8010408@gentoo.org>
On Sun, Jun 24, 2012 at 7:33 PM, Sebastian Pipping <sping@gentoo.org> wrote:
> On 12/10/2011 11:15 PM, Sebastian Pipping wrote:
>> [T]he full run on my shell:
>>
>> # git branch catalyst_3 master
>>
>> # git checkout master
>>
>> # git merge $(git commit-tree catalyst_2^{tree} \
>> -p catalyst_2 -p master \
>> <<<"Replace content on master with content from catalyst_2")
>>
>> # git push origin master
>>
>> # git push origin catalyst_3
>>
>>
>> Results is:
>>
>> - 2.x content on branch master (and catalyst_2)
>>
>> - 3.x content on branch catalyst_3
>
> This procedure above is still left to do. Any objections?
> With no objections, I will go forward on next monday (2012-07-02).
If you're confident it'll work -- please proceed. No use in waiting.
next prev parent reply other threads:[~2012-06-25 6:03 UTC|newest]
Thread overview: 20+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-06-27 4:44 [gentoo-catalyst] rfc: merging catalyst git branches William Hubbs
2011-12-08 19:46 ` William Hubbs
2011-12-08 20:31 ` Sebastian Pipping
2011-12-08 21:42 ` William Hubbs
2011-12-08 23:43 ` Sebastian Pipping
2011-12-09 1:55 ` Jorge Manuel B. S. Vicetto
2011-12-09 2:56 ` Sebastian Pipping
2011-12-09 3:19 ` William Hubbs
2011-12-09 4:42 ` Sebastian Pipping
2011-12-09 16:16 ` William Hubbs
2011-12-09 17:37 ` Matt Turner
2011-12-09 18:38 ` Sebastian Pipping
2011-12-09 18:48 ` Sebastian Pipping
2011-12-10 14:45 ` William Hubbs
2011-12-10 22:15 ` Sebastian Pipping
2011-12-11 0:35 ` Peter Stuge
2012-06-24 23:33 ` Sebastian Pipping
2012-06-25 4:04 ` Matt Turner [this message]
2012-07-02 14:55 ` Sebastian Pipping
2012-07-02 21:00 ` Matt Turner
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='CAEdQ38E0AjT77vc4wXH88A-t4vV4wf=fRrmidikzoDeMVwFduA@mail.gmail.com' \
--to=mattst88@gentoo.org \
--cc=gentoo-catalyst@lists.gentoo.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