From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 505421396DB for ; Sat, 14 Oct 2017 09:20:13 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 7515B2BC05F; Sat, 14 Oct 2017 09:20:11 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 45E7B2BC05F for ; Sat, 14 Oct 2017 09:20:11 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id F2D3433BEBE for ; Sat, 14 Oct 2017 09:20:03 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 03E4531B for ; Sat, 14 Oct 2017 09:20:01 +0000 (UTC) From: "Ulrich Müller" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Ulrich Müller" Message-ID: <1507972598.aef4c2a59e8e6f03f06e937c2fcae8f59f25ca9f.ulm@gentoo> Subject: [gentoo-commits] data/glep:master commit in: / X-VCS-Repository: data/glep X-VCS-Files: glep-0066.rst X-VCS-Directories: / X-VCS-Committer: ulm X-VCS-Committer-Name: Ulrich Müller X-VCS-Revision: aef4c2a59e8e6f03f06e937c2fcae8f59f25ca9f X-VCS-Branch: master Date: Sat, 14 Oct 2017 09:20:01 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 70f5ec87-a69d-49d7-8b2c-8106b0a93cbe X-Archives-Hash: 206f8d8198ef377968168b5cec88b975 commit: aef4c2a59e8e6f03f06e937c2fcae8f59f25ca9f Author: Michał Górny gentoo org> AuthorDate: Tue Oct 10 21:15:23 2017 +0000 Commit: Ulrich Müller gentoo org> CommitDate: Sat Oct 14 09:16:38 2017 +0000 URL: https://gitweb.gentoo.org/data/glep.git/commit/?id=aef4c2a5 glep-0066: Try to clarify merge commit ancestry Requested by Ulrich Müller. glep-0066.rst | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/glep-0066.rst b/glep-0066.rst index 8eabec0..50f7aa1 100644 --- a/glep-0066.rst +++ b/glep-0066.rst @@ -82,10 +82,10 @@ of implicit ``git pull`` merges is entirely forbidden. In a merge commit that is committed straight to the Gentoo repository, the first parent is expected to reference an actual Gentoo commit preceding the merge, while the remaining parents can be used to -reference external repositories. The commits following the first parent -are required to conform to this specification alike regular Gentoo -commits. The additional commits following other parents can use relaxed -rules. +reference commits originating from external repositories. The commits +on the ancestry path of the first parent (up to the next merge commit) +are required to conform to this specification. The commits on remaining +ancestry paths can use relaxed rules. OpenPGP signatures