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 1RZ5Vc-00050G-FF for garchives@archives.gentoo.org; Fri, 09 Dec 2011 18:49:24 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id BA97C21C127; Fri, 9 Dec 2011 18:49:10 +0000 (UTC) Received: from smtprelay03.ispgateway.de (smtprelay03.ispgateway.de [80.67.31.26]) by pigeon.gentoo.org (Postfix) with ESMTP id 809C621C127 for ; Fri, 9 Dec 2011 18:49:10 +0000 (UTC) Received: from [85.179.20.16] (helo=[192.168.1.2]) by smtprelay03.ispgateway.de with esmtpsa (TLSv1:AES256-SHA:256) (Exim 4.68) (envelope-from ) id 1RZ5VN-0008Mf-CH for gentoo-catalyst@lists.gentoo.org; Fri, 09 Dec 2011 19:49:09 +0100 Message-ID: <4EE25814.1000308@gentoo.org> Date: Fri, 09 Dec 2011 19:48:52 +0100 From: Sebastian Pipping User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:8.0) Gecko/20111118 Thunderbird/8.0 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 To: gentoo-catalyst@lists.gentoo.org Subject: Re: [gentoo-catalyst] rfc: merging catalyst git branches References: <20110627044433.GA9772@linux1> <20111208194623.GA2416@linux1> <4EE16A9A.4090609@gentoo.org> <20111209031956.GA11180@linux1> <4EE1919B.5000308@gentoo.org> <20111209161625.GA5998@linux1> In-Reply-To: <20111209161625.GA5998@linux1> Content-Type: text/plain; charset=windows-1252 Content-Transfer-Encoding: 7bit X-Df-Sender: c3BpbmctZ2VudG9vQGJpbmVyYS5kZQ== X-Archives-Salt: a1e7533a-0a16-418d-b7c9-83d3d8ad7bfc X-Archives-Hash: 07736eaeee7776538de89bcfb3737566 On 12/09/2011 05:16 PM, William Hubbs wrote: > Yes, I saw it, but it doesn't seem to do what we want. It merges the > branches together instead of swapping them. Maybe it's not what _you_ want, but it does - make catalyst_2 content appear on master - doesn't break fast forward "git pull" for anyone - supports branching catalyst_2 off master, too So besides the merge commit, this can look like rename from the outside. >>> 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. It does, a forced push would be necessary: you are pushing commits to master that are not successors of the remote master's HEAD. >> What would be the gain here? > > 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. A clean history is *not* a history without merge commits but a history reflecting what happened in reality. There are cases where it makes sens to even force a merge commit using git merge --no-ff to clearly indicate that a dedicated branch was merged back. Best, Sebastian