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 1RZ4P4-00075J-0m for garchives@archives.gentoo.org; Fri, 09 Dec 2011 17:38:34 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id BF43021C033; Fri, 9 Dec 2011 17:38:21 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 8795721C033 for ; Fri, 9 Dec 2011 17:38:21 +0000 (UTC) Received: from mail-pz0-f53.google.com (mail-pz0-f53.google.com [209.85.210.53]) (using TLSv1 with cipher RC4-SHA (128/128 bits)) (No client certificate requested) (Authenticated sender: mattst88) by smtp.gentoo.org (Postfix) with ESMTPSA id DD5581B4009 for ; Fri, 9 Dec 2011 17:38:20 +0000 (UTC) Received: by dady9 with SMTP id y9so4626935dad.40 for ; Fri, 09 Dec 2011 09:38:19 -0800 (PST) Received: by 10.68.72.195 with SMTP id f3mr7852768pbv.130.1323452299429; Fri, 09 Dec 2011 09:38:19 -0800 (PST) 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 Received: by 10.68.211.137 with HTTP; Fri, 9 Dec 2011 09:37:58 -0800 (PST) In-Reply-To: <20111209161625.GA5998@linux1> References: <20110627044433.GA9772@linux1> <20111208194623.GA2416@linux1> <4EE16A9A.4090609@gentoo.org> <20111209031956.GA11180@linux1> <4EE1919B.5000308@gentoo.org> <20111209161625.GA5998@linux1> From: Matt Turner Date: Fri, 9 Dec 2011 12:37:58 -0500 Message-ID: Subject: Re: [gentoo-catalyst] rfc: merging catalyst git branches To: gentoo-catalyst@lists.gentoo.org Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: quoted-printable X-Archives-Salt: 055081a2-0348-4043-aec5-2ac585d516aa X-Archives-Hash: dbdbc63106d44d8d75154d72bd467e37 On Fri, Dec 9, 2011 at 11:16 AM, William Hubbs wrote: > On Fri, Dec 09, 2011 at 05:42:03AM +0100, Sebastian Pipping wrote: >> On 12/09/2011 04:19 AM, William Hubbs wrote: >> > Hi Jorge, >> > >> > Ok, no problem, I'll go back to the #git channel tomorrow and >> > investigate how to do that. >> >> Have you received my other mail with notes on git commit-tree and how it >> can help here? =A0It was sent "Fri, 09 Dec 2011 00:43:45 +0100". > > =A0Yes, I saw it, but it doesn't seem to do what we want. It merges the > =A0branches together instead of swapping them. > >> > I would prefer to do it without merge commits if possible > > What I want is something like: > > git branch -m master catalyst_3 > git branch -m catalyst_2 master > # now update the upstream repo to match this. > # I'm not sure if this will cause a forced update or not though. > >> >> What would be the gain here? > > =A0The gain is that git log doesn't show a merge commit, and you aren't > =A0pushing another 70 plus commits to the master branch, so you keep the > =A0history clean. What Sebastian was suggesting was this, which works (I just verified locall= y) git checkout master git branch catalyst_3 # creates a branch identical to master called catalys= t_3 git branch -M catalyst_2 master # renames the catalyst_2 branch to master