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 1RZ3Cg-0007HY-ID for garchives@archives.gentoo.org; Fri, 09 Dec 2011 16:21:42 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 0912F21C233; Fri, 9 Dec 2011 16:21:31 +0000 (UTC) Received: from mail-gy0-f181.google.com (mail-gy0-f181.google.com [209.85.160.181]) by pigeon.gentoo.org (Postfix) with ESMTP id CA0FD21C233 for ; Fri, 9 Dec 2011 16:21:31 +0000 (UTC) Received: by ghbg18 with SMTP id g18so3059523ghb.40 for ; Fri, 09 Dec 2011 08:21:31 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=sender:date:from:to:subject:message-id:mail-followup-to:references :mime-version:content-type:content-disposition:in-reply-to :user-agent; bh=9A86aLz6PwFZzBr45GCbmsevVJX/ol7Ysh34z74Sdjk=; b=OzX05dUuurJszQPngXyXZhXgaARaubFG5auDT4bPzw5UH5rzazgCkwiqTrr2TdepA9 9WBd+gKp1JeiUpA4iVpsTiIEU1YjAVvmyqSdqHrlCx3WCwDyemuNP7llGKUPJ2IZaq58 UgK+zwuazpui4lk+PEg1d0KCSmSaEwKHY0nh8= Received: by 10.236.135.77 with SMTP id t53mr12848612yhi.49.1323447691342; Fri, 09 Dec 2011 08:21:31 -0800 (PST) Received: from linux1 (cpe-76-187-77-158.tx.res.rr.com. [76.187.77.158]) by mx.google.com with ESMTPS id 11sm14188128anp.13.2011.12.09.08.21.28 (version=SSLv3 cipher=OTHER); Fri, 09 Dec 2011 08:21:29 -0800 (PST) Sender: William Hubbs Received: by linux1 (sSMTP sendmail emulation); Fri, 09 Dec 2011 10:16:25 -0600 Date: Fri, 9 Dec 2011 10:16:25 -0600 From: William Hubbs To: gentoo-catalyst@lists.gentoo.org Subject: Re: [gentoo-catalyst] rfc: merging catalyst git branches Message-ID: <20111209161625.GA5998@linux1> Mail-Followup-To: gentoo-catalyst@lists.gentoo.org References: <20110627044433.GA9772@linux1> <20111208194623.GA2416@linux1> <4EE16A9A.4090609@gentoo.org> <20111209031956.GA11180@linux1> <4EE1919B.5000308@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="liOOAslEiF7prFVr" Content-Disposition: inline In-Reply-To: <4EE1919B.5000308@gentoo.org> User-Agent: Mutt/1.5.21 (2010-09-15) X-Archives-Salt: 6dbad6e0-85ef-4eef-87c7-9d307d6622c5 X-Archives-Hash: d7c1b67ad7000aec7e3c72b9d70423ba --liOOAslEiF7prFVr Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable 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, > >=20 > > Ok, no problem, I'll go back to the #git channel tomorrow and > > investigate how to do that. >=20 > Have you received my other mail with notes on git commit-tree and how it > can help here? It was sent "Fri, 09 Dec 2011 00:43:45 +0100". =20 Yes, I saw it, but it doesn't seem to do what we want. It merges the branches 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. >=20 > What would be the gain here? =20 The gain is that git log doesn't show a merge commit, and you aren't pushing another 70 plus commits to the master branch, so you keep the history clean. Best, William --liOOAslEiF7prFVr Content-Type: application/pgp-signature -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.17 (GNU/Linux) iEYEARECAAYFAk7iNFkACgkQblQW9DDEZTgFUgCgnLHbAe5iNZdK2Xrtz6Wec4AC pxwAn0QBW0AVazFJ2D6LPd2rBDQUkn6l =vnMe -----END PGP SIGNATURE----- --liOOAslEiF7prFVr--