From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from pigeon.gentoo.org ([208.92.234.80] helo=lists.gentoo.org) by finch.gentoo.org with esmtp (Exim 4.60) (envelope-from ) id 1QahVC-0004Xr-SH for garchives@archives.gentoo.org; Sun, 26 Jun 2011 05:03:23 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id A4AAB1C107; Sun, 26 Jun 2011 05:03:04 +0000 (UTC) Received: from mail-yw0-f53.google.com (mail-yw0-f53.google.com [209.85.213.53]) by pigeon.gentoo.org (Postfix) with ESMTP id 72BA51C0F4 for ; Sun, 26 Jun 2011 05:03:04 +0000 (UTC) Received: by ywm21 with SMTP id 21so2477315ywm.40 for ; Sat, 25 Jun 2011 22:03:04 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:sender:date:from:to:subject:message-id :mail-followup-to:mime-version:content-type:content-disposition :user-agent; bh=vSORxiKVqcoNirCnJAVG9glsRFAFRb5c6lGB3AAcbBo=; b=j87cBZtPTRRkW3e+tkUGTuLPvLEn2MeXx+hF3/6Uot4FKyVhmOyHxzrSqdhY+BS88V Y27R5MyrdTqGA5BpC84PBuSYb6KHQwdKFZo3dZS4YSPr0V+oR6TzJlxwaANmdUeZOgU5 cNVOC8FiYV+LkL801knClN/iatYCv1dR8tHyQ= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=sender:date:from:to:subject:message-id:mail-followup-to :mime-version:content-type:content-disposition:user-agent; b=hOi8mMxwxD63bCkJtg1/OuPHSz/eT6yLh1C0rAqSw54tyHC1T4rvCpTyI1GE/cAv4M wUwLDy0COKdeMM2bM/XAp/TgItymuDfpyy8sFE2UE6iLtEzBQFD689BmNu83YSHoUbJf 78UbRtfFlXD2GnsTMtGVy4LQL2i19ZhOxiuGI= Received: by 10.236.161.167 with SMTP id w27mr7358760yhk.232.1309064583852; Sat, 25 Jun 2011 22:03:03 -0700 (PDT) Received: from linux1 (cpe-76-187-76-173.tx.res.rr.com [76.187.76.173]) by mx.google.com with ESMTPS id u64sm2704876yhm.27.2011.06.25.22.03.02 (version=SSLv3 cipher=OTHER); Sat, 25 Jun 2011 22:03:03 -0700 (PDT) Sender: William Hubbs Received: by linux1 (sSMTP sendmail emulation); Sun, 26 Jun 2011 00:03:01 -0500 Date: Sun, 26 Jun 2011 00:03:01 -0500 From: William Hubbs To: gentoo-catalyst@lists.gentoo.org Subject: [gentoo-catalyst] master rebase of catalyst 2 Message-ID: <20110626050301.GD6710@linux1> Mail-Followup-To: gentoo-catalyst@lists.gentoo.org Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-catalyst@lists.gentoo.org Reply-to: gentoo-catalyst@lists.gentoo.org MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha1; protocol="application/pgp-signature"; boundary="9UV9rz0O2dU/yYYn" Content-Disposition: inline User-Agent: Mutt/1.5.21 (2010-09-15) X-Archives-Salt: X-Archives-Hash: 554af41ee316a3876a2f47e522e950c0 --9UV9rz0O2dU/yYYn Content-Type: text/plain; charset=us-ascii Content-Disposition: inline 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 --9UV9rz0O2dU/yYYn Content-Type: application/pgp-signature -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.17 (GNU/Linux) iEYEARECAAYFAk4GvYUACgkQblQW9DDEZTi0KwCglvQ0nUsDLpPx9e94h2dFbWMN 0/QAn0Hlk8hbvnaH73tVF8DJY5mTVOu4 =U6Ql -----END PGP SIGNATURE----- --9UV9rz0O2dU/yYYn--