From: Peter Stuge <peter@stuge.se>
To: gentoo-catalyst@lists.gentoo.org
Subject: Re: [gentoo-catalyst] rfc: merging catalyst git branches
Date: Sun, 11 Dec 2011 01:35:48 +0100 [thread overview]
Message-ID: <20111211003548.21706.qmail@stuge.se> (raw)
In-Reply-To: <4EE3DA15.4060307@gentoo.org>
Sebastian Pipping wrote:
> > 3) put the code on catalyst_2 on master.
> >
> > What about this?
>
> Either git commit-tree or forced push.
git commit-tree is the better way. Sometimes it is neccessary to
rewrite public history, but this is not one of those times.
Whenever it is not absolutely neccessary, it's better to do something
else on the branch than rewrite it - unless the branch is well known
to be rewritten (like a testing branch might be).
catalyst master is not a testing branch and shouldn't be rewritten.
William, please go with Sebastian's suggestion.
//Peter
next prev parent reply other threads:[~2011-12-11 0:36 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 [this message]
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=20111211003548.21706.qmail@stuge.se \
--to=peter@stuge.se \
--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