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 B452A13824A for ; Sun, 8 May 2016 09:36:01 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 8F6B121C03C; Sun, 8 May 2016 09:35:48 +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 71341E07DB for ; Sun, 8 May 2016 09:35:47 +0000 (UTC) Received: from [192.168.1.2] (c-73-53-75-119.hsd1.wa.comcast.net [73.53.75.119]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) (Authenticated sender: zlg) by smtp.gentoo.org (Postfix) with ESMTPSA id 6B90F3404A5 for ; Sun, 8 May 2016 09:35:46 +0000 (UTC) Subject: Re: [gentoo-dev] On banning merge commits To: gentoo-dev@lists.gentoo.org References: <20160507235222.GA16750@ultrachro.me> <20160508070931.370b09b3.mgorny@gentoo.org> <20160508054443.5480531.22907.95536@pathscale.com> <20160508082123.GA12156@kroah.com> From: Daniel Campbell Message-ID: <18442f28-fb22-8a36-5e46-03874b43f708@gentoo.org> Date: Sun, 8 May 2016 02:35:38 -0700 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:45.0) Gecko/20100101 Thunderbird/45.0 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 In-Reply-To: <20160508082123.GA12156@kroah.com> Content-Type: multipart/signed; micalg=pgp-sha256; protocol="application/pgp-signature"; boundary="4cQ32Urwm6CKMCJDd0aHtO8pfnOBsH646" X-Archives-Salt: 980764ff-5c45-49b6-90ac-2b213d4ccec6 X-Archives-Hash: 30d656db57b48938208b9f0e06d64ec4 This is an OpenPGP/MIME signed message (RFC 4880 and 3156) --4cQ32Urwm6CKMCJDd0aHtO8pfnOBsH646 Content-Type: multipart/mixed; boundary="XwQNfULdn4f2GULj1P5wV2ekKeuwiaSxp" From: Daniel Campbell To: gentoo-dev@lists.gentoo.org Message-ID: <18442f28-fb22-8a36-5e46-03874b43f708@gentoo.org> Subject: Re: [gentoo-dev] On banning merge commits References: <20160507235222.GA16750@ultrachro.me> <20160508070931.370b09b3.mgorny@gentoo.org> <20160508054443.5480531.22907.95536@pathscale.com> <20160508082123.GA12156@kroah.com> In-Reply-To: <20160508082123.GA12156@kroah.com> --XwQNfULdn4f2GULj1P5wV2ekKeuwiaSxp Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable On 05/08/2016 01:21 AM, Greg KH wrote: > On Sun, May 08, 2016 at 01:44:43PM +0800, cbergstrom@pathscale.com wrot= e: >> Don't be crazy - I know many developer groups which dislike merge >> commits. That nonlinear work flow is just a mess long term. >=20 > Really? What "mess" does it cause? >=20 > Are things harder to bisect? Harder to determine what came before what= ? > Harder to do future development? Harder because it is unfamiliar > compared to the cvs workflow? >=20 > Or just "messier" when you look at the graph of the tree? >=20 > What is the _real_ reason that you don't like merges? >=20 > thanks, >=20 > greg k-h >=20 I don't have a strong -- or even clear -- opinion on the matter, but I could imagine it being a bother to see a bunch of "merge commit" commit messages in `git log` and not really have much to go on as far as "who submitted this, who approved it, what does it fix, etc". As far as I know, there's only the committer information and any GPG-signing that may have accompanied it, as we do in Gentoo. If I have any details wrong, please clarify. I've heard about a way to "redo" history in a git repository as well, especially before pushing. Could that be a way to mitigate merge commits, so they are more informative and conform to our commit message convention? Sincerely, a neutral party --=20 Daniel Campbell - Gentoo Developer OpenPGP Key: 0x1EA055D6 @ hkp://keys.gnupg.net fpr: AE03 9064 AE00 053C 270C 1DE4 6F7A 9091 1EA0 55D6 --XwQNfULdn4f2GULj1P5wV2ekKeuwiaSxp-- --4cQ32Urwm6CKMCJDd0aHtO8pfnOBsH646 Content-Type: application/pgp-signature; name="signature.asc" Content-Description: OpenPGP digital signature Content-Disposition: attachment; filename="signature.asc" -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 iQIcBAEBCAAGBQJXLwhwAAoJEAEkDpRQOeFwPJQP/09gDqTc5hsizG0c8NjmolH/ WDI58HpoAO1+mFh93jIjWpOig+0w+1wc1nf9E66urlQyC6joZD/xR9ACuWytu0Fs 55DoA0Ir/KkY/Pdi9myXxxs5+EBznaNtzdsuk0VlNm8bUoqS20sgqD1+CJMAKUlb BRJFuaGg+2AZ5G7TvCIoU0NboP2qJLxuAJ8ZXBPPxdGZbpZoBDfeM37pbm/hW7+H tCcs0fU3YFM2I89F6l5mrOwGT8vXBxVKPbHX7GounV8jHmsRu1lkhUGr+3X4bBym wWCgz3ho53PN+tCvZDnlO6Zh+L8qo2qpG3YIewjQReJ6dUCQz2iJ3CEXN++0vjQC EignBdiN7gJhbodArKnOuiq8WhmTHctOOdm2gUJ2O8wyN6TvkT/e2QUuii+YUcOq 75IH1UD0lsqIiVgaTH5IWr+8lbEEjSE+EkvpiSkfqOhN4s3MsUkOdQEetGd35mEe svxRJUoMcVFN32NCLs4LU5DOpMXy//m5rthMEKxCURNM+xNPwqGCPcmVJgSKC5mY KKozvjt1tIFAJxYKT8IeEo14JhhADxsMn+3mfqJy/gM/A/Ac4m/Y5qkyvZLX4s3E SXZUObMvfJwF904Qf3iwMXzIUyyaDD6V5u15lSUmsjVyEaN12DY066DRATpkSeL1 X2JNT+l00LNbJ2Q9vqns =3d4X -----END PGP SIGNATURE----- --4cQ32Urwm6CKMCJDd0aHtO8pfnOBsH646--