diff options
| author |   Michał Górny <mgorny@gentoo.org> | 2017-10-10 23:15:23 +0200 |
|---|---|---|
| committer |   Ulrich Müller <ulm@gentoo.org> | 2017-10-14 11:16:38 +0200 |
| commit | aef4c2a59e8e6f03f06e937c2fcae8f59f25ca9f (patch) | |
| tree | 1a590d148f76bc3bc9164cd3f179ad3afc919213 | |
| parent | Import GLEP 66 from wiki (diff) | |
| download | glep-aef4c2a5.tar.gz glep-aef4c2a5.tar.bz2 glep-aef4c2a5.zip | |
glep-0066: Try to clarify merge commit ancestry
Requested by Ulrich Müller.
| -rw-r--r-- | glep-0066.rst | 8 |
1 files 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 |