[gentoo-commits] data/glep:master commit in: /

["Ulrich Müller" <ulm@gentoo.org>]

commit:     aef4c2a59e8e6f03f06e937c2fcae8f59f25ca9f
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Tue Oct 10 21:15:23 2017 +0000
Commit:     Ulrich Müller <ulm <AT> gentoo <DOT> 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