public inbox for gentoo-dev@lists.gentoo.org
 help / color / mirror / Atom feed
From: Patrice Clement <monsieurp@gentoo.org>
To: gentoo-dev@lists.gentoo.org
Subject: [gentoo-dev] On banning merge commits
Date: Sun, 8 May 2016 01:52:22 +0200	[thread overview]
Message-ID: <20160507235222.GA16750@ultrachro.me> (raw)

[-- Attachment #1: Type: text/plain, Size: 690 bytes --]

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 worded 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,

-- 
Patrice Clement
Gentoo Linux developer
http://www.gentoo.org

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 473 bytes --]

             reply	other threads:[~2016-05-07 23:52 UTC|newest]

Thread overview: 39+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2016-05-07 23:52 Patrice Clement [this message]
2016-05-08  5:09 ` [gentoo-dev] On banning merge commits Michał Górny
2016-05-08  5:44   ` cbergstrom
2016-05-08  8:21     ` Greg KH
2016-05-08  9:35       ` Daniel Campbell
2016-05-08  8:58     ` [gentoo-dev] " Duncan
2016-05-08  9:25       ` Kent Fredric
2016-05-08 10:21         ` Duncan
2016-05-08 10:35         ` Dirkjan Ochtman
2016-05-08 10:30   ` [gentoo-dev] " Dirkjan Ochtman
2016-05-08 12:00     ` Michał Górny
2016-05-08 12:31       ` Dirkjan Ochtman
2016-05-08 11:13   ` Andreas K. Hüttel
2016-05-08 11:28     ` M. J. Everitt
2016-05-08  9:15 ` Andrew Savchenko
2016-05-08 10:06 ` Amadeusz Żołnowski
2016-05-08 12:53   ` Brian Dolbec
2016-05-08 15:15     ` Jeroen Roovers
2016-05-08 22:25     ` Daniel Campbell
2016-05-08 11:25 ` Andreas K. Hüttel
2016-05-08 11:57   ` Rich Freeman
2016-05-08 12:07     ` Kent Fredric
2016-05-08 21:56     ` [gentoo-dev] " Duncan
2016-05-08 12:09   ` [gentoo-dev] " Anthony G. Basile
2016-05-08 12:18     ` Kent Fredric
2016-05-08 12:34       ` Rich Freeman
2016-05-08 12:43         ` Anthony G. Basile
2016-05-08 22:02         ` [gentoo-dev] " Duncan
2016-05-08 17:03 ` [gentoo-dev] " Alexis Ballier
2016-05-08 17:07   ` Kent Fredric
2016-05-09 11:27     ` Kristian Fiskerstrand
2016-05-09 12:23       ` Rich Freeman
2016-05-09 12:36         ` Kent Fredric
2016-05-09 12:59           ` Rich Freeman
2016-05-10 12:04     ` Alexis Ballier
2016-05-10 14:18       ` Kent Fredric
2016-05-11 10:21         ` Alexis Ballier
2016-05-11 14:34           ` Kent Fredric
2016-05-11 15:12             ` Rich Freeman

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20160507235222.GA16750@ultrachro.me \
    --to=monsieurp@gentoo.org \
    --cc=gentoo-dev@lists.gentoo.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox