From: William Hubbs <williamh@gentoo.org>
To: gentoo-catalyst@lists.gentoo.org
Subject: [gentoo-catalyst] master rebase of catalyst 2
Date: Sun, 26 Jun 2011 00:03:01 -0500 [thread overview]
Message-ID: <20110626050301.GD6710@linux1> (raw)
[-- Attachment #1: Type: text/plain, Size: 506 bytes --]
All,
I checked out a local branch from master earlier today and rebased that
on catalyst_2. Now that branch has over 100 commits, which will be the
combination of everything on catilyst 2 and current master.
So, how would you suggest we get that branch back out where everyone can
see it? Do you want me to put it back out on master? It won't be a
forced update, because I used rebase instead of merge.
The only catch is I don't know how broken that will leave master.
What are your thoughts?
William
[-- Attachment #2: Type: application/pgp-signature, Size: 198 bytes --]
next reply other threads:[~2011-06-26 5:03 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-06-26 5:03 William Hubbs [this message]
2011-06-26 6:26 ` [gentoo-catalyst] master rebase of catalyst 2 Sebastian Pipping
2011-06-26 7:56 ` William Hubbs
2011-06-26 8:45 ` William Hubbs
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=20110626050301.GD6710@linux1 \
--to=williamh@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