From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id 6721313824A for ; Sat, 7 May 2016 23:52:42 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 8599F21C08E; Sat, 7 May 2016 23:52:34 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 88713E086E for ; Sat, 7 May 2016 23:52:33 +0000 (UTC) Received: from gentoo.org (ultrachro.me [91.121.149.60]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) (Authenticated sender: monsieurp@gentoo.org) by smtp.gentoo.org (Postfix) with ESMTPSA id B09DF3406C0 for ; Sat, 7 May 2016 23:52:30 +0000 (UTC) Received: by gentoo.org (nbSMTP-1.00) for uid 1000 (using TLSv1/SSLv3 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) monsieurp@gentoo.org; Sun, 8 May 2016 01:52:30 +0200 (CEST) Date: Sun, 8 May 2016 01:52:22 +0200 From: Patrice Clement To: gentoo-dev@lists.gentoo.org Subject: [gentoo-dev] On banning merge commits Message-ID: <20160507235222.GA16750@ultrachro.me> 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-sha256; protocol="application/pgp-signature"; boundary="4Ckj6UjgE2iN1+kY" Content-Disposition: inline User-Agent: Mutt/1.5.24 (2015-08-30) X-Archives-Salt: 6b9bd3fd-01d9-4588-a9f0-1ebf6e2bc897 X-Archives-Hash: e4132908e9621054ba081156c30d40ce --4Ckj6UjgE2iN1+kY Content-Type: text/plain; charset=iso-8859-1 Content-Disposition: inline Content-Transfer-Encoding: quoted-printable Hi gents After yet another discussion about git in the #gentoo-dev channel tonight, = the topic of merge commits came up for the umpteenth time. We all seem to agree merge commits are really bad design, add clutter to the log graph after a while and should be banned altogether from reaching the central repository. As of now, no policy is in place yet to keep developers from pushing merge commits. What is the correct course of action? I would very much like it to be worde= d in a document (GLEP and/or Wiki page) so that confusion is avoided and we all = are on the same page on this topic. Cheers, --=20 Patrice Clement Gentoo Linux developer http://www.gentoo.org --4Ckj6UjgE2iN1+kY Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 iQEcBAABCAAGBQJXLn+2AAoJEJGRpfGTSRu48SYIAIE+kBjsI03PnIKCPtCAg6sS 6ehA8De/F/IPODTlCCmewtP9/MHPwGqrI7naBplRgkTD9UFC0Nq2A9oxAuCWpuZ/ 0D3G3WTdbOC7D4XXnYuxqr2BfHmBKLnKoHfIHyjLb4YfF+FfxrP8TQ5/EgDB4rnF CM8iARN7XX2kDYOrX8Qb8af0jTGqCVOGpj0YMncdAoLUClQcwiE47xgcFX+NbtOZ WZBpNaiUjC6rFu2vWawnhXYpAmRa8vMK2Vbrf4t4VBTho8CNGjNy5yxZ8hNkuvDX 8srl6wwWc/AuPPWu1Q2Q50Rs/lFvi95FDAgODl5XcEOXM9u0NqoaNEf9/UM38mw= =tSqB -----END PGP SIGNATURE----- --4Ckj6UjgE2iN1+kY--