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 1SaDUj-0005pM-Ix for garchives@archives.gentoo.org; Thu, 31 May 2012 22:05:26 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 157AFE07AA; Thu, 31 May 2012 22:05:07 +0000 (UTC) Received: from mail-ob0-f181.google.com (mail-ob0-f181.google.com [209.85.214.181]) by pigeon.gentoo.org (Postfix) with ESMTP id 2FAEBE0788 for ; Thu, 31 May 2012 22:04:32 +0000 (UTC) Received: by obbuo19 with SMTP id uo19so2108091obb.40 for ; Thu, 31 May 2012 15:04:32 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:date:from:to:subject:message-id:mail-followup-to:references :mime-version:content-type:content-disposition:in-reply-to :user-agent; bh=Fg//5J1etk9+vJWc5u82TejMb5YHQ1KfjddT2KTEpIY=; b=pEkzcD+oTuQ0Iuk/8v1iIt2ajfY0294S6LrXBWW6mXcXkpxGR7fhmwVjt67AicwLVz cE8daVB0I3KwTyMEomeUl4kb4xtEzPBWh1zmn0dtbIwR7yqXu6W6inD+T2e1lsKjP0aI hKnnpVHsXjbZXCqfFS6FmcOuXjONXG+unZHZqTvsuQZ8Eyw3QWMMnPZ4t1AnlXUCbnh9 AwmlJRoPZUVzSw+fLiYuj9dbtvPotMHbMIQx1eVmf7hJlH+ERX2iraH2M5/UgCMnVEnc cg7W5JoH6SHENa/xugZ7AFghSq1ZeX+vcgHjpKXk3A3j9fhqKz4BPoOrdQXasE1/4ETX NyWQ== Received: by 10.60.24.67 with SMTP id s3mr277734oef.54.1338501872449; Thu, 31 May 2012 15:04:32 -0700 (PDT) Received: from linux1 (cpe-76-187-77-158.tx.res.rr.com. [76.187.77.158]) by mx.google.com with ESMTPS id r8sm2851425oer.6.2012.05.31.15.04.30 (version=SSLv3 cipher=OTHER); Thu, 31 May 2012 15:04:32 -0700 (PDT) Sender: William Hubbs Received: by linux1 (sSMTP sendmail emulation); Thu, 31 May 2012 17:04:30 -0500 Date: Thu, 31 May 2012 17:04:30 -0500 From: William Hubbs To: gentoo-dev@lists.gentoo.org Subject: Re: [gentoo-dev] Re: Portage Git migration - clean cut or git-cvsserver Message-ID: <20120531220430.GA26086@linux1> Mail-Followup-To: gentoo-dev@lists.gentoo.org References: <20120531191804.GA24784@linux1> <20120531202331.14f1a6c9@googlemail.com> Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-dev@lists.gentoo.org Reply-to: gentoo-dev@lists.gentoo.org MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha1; protocol="application/pgp-signature"; boundary="tKW2IUtsqtDRztdT" Content-Disposition: inline In-Reply-To: <20120531202331.14f1a6c9@googlemail.com> User-Agent: Mutt/1.5.21 (2010-09-15) X-Archives-Salt: 5e491df4-f6ef-477b-afee-738ecb9666ba X-Archives-Hash: 7d67986cffe996a230936135a27e0dbd --tKW2IUtsqtDRztdT Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On Thu, May 31, 2012 at 08:23:31PM +0100, Ciaran McCreesh wrote: > On Thu, 31 May 2012 14:18:04 -0500 > William Hubbs wrote: > > > Not sure I'm following, but I will be the first to admit that I'm a > > > git novice. Would this be aided by a convention, like only > > > committing to master on the gentoo official repository, and any > > > on-the-side work on places like github/etc stays in branches? > > > Those repositories would just keep getting fed commits on master > > > from the official repository. > >=20 > > Iagree with this; I think we should ban merge commits on master. That > > would force everyone to rebase their work on current master before > > they commit to master which would make the history clean. >=20 > So what's the point of switching to git if you want to ban the main > reason git exists? To clarify: we should only allow fast-forward merges on master. My big complaint about merge commits is if you do a git show on a merge commit, you get nothing, so there is no way to see what actually changed in that commit. William --tKW2IUtsqtDRztdT Content-Type: application/pgp-signature -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.17 (GNU/Linux) iEYEARECAAYFAk/H6u4ACgkQblQW9DDEZThRGgCdHhFQYaagj5labnFOjQfY9cYr 14kAniC6vdhd1UIGxlsXFPlmFXe0Nm4p =yUhI -----END PGP SIGNATURE----- --tKW2IUtsqtDRztdT--