From: Sebastian Pipping <sping@gentoo.org>
To: gentoo-catalyst@lists.gentoo.org
Subject: Re: [gentoo-catalyst] rfc: merging catalyst git branches
Date: Fri, 09 Dec 2011 19:38:01 +0100 [thread overview]
Message-ID: <4EE25589.40507@gentoo.org> (raw)
In-Reply-To: <CAEdQ38F+omwiOpmqBQ24bnzwuZoT=aif1uUpG0__i-uFAud0_g@mail.gmail.com>
On 12/09/2011 06:37 PM, Matt Turner wrote:
> What Sebastian was suggesting was this, which works (I just verified locally)
>
> git checkout master
> git branch catalyst_3 # creates a branch identical to master called catalyst_3
> git branch -M catalyst_2 master # renames the catalyst_2 branch to master
No, step three uses git commit-tree and git merge in my approach -- it's
not a rename.
Sebastian
next prev parent reply other threads:[~2011-12-09 18:38 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 [this message]
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
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=4EE25589.40507@gentoo.org \
--to=sping@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