1 |
commit: aef4c2a59e8e6f03f06e937c2fcae8f59f25ca9f |
2 |
Author: Michał Górny <mgorny <AT> gentoo <DOT> org> |
3 |
AuthorDate: Tue Oct 10 21:15:23 2017 +0000 |
4 |
Commit: Ulrich Müller <ulm <AT> gentoo <DOT> org> |
5 |
CommitDate: Sat Oct 14 09:16:38 2017 +0000 |
6 |
URL: https://gitweb.gentoo.org/data/glep.git/commit/?id=aef4c2a5 |
7 |
|
8 |
glep-0066: Try to clarify merge commit ancestry |
9 |
|
10 |
Requested by Ulrich Müller. |
11 |
|
12 |
glep-0066.rst | 8 ++++---- |
13 |
1 file changed, 4 insertions(+), 4 deletions(-) |
14 |
|
15 |
diff --git a/glep-0066.rst b/glep-0066.rst |
16 |
index 8eabec0..50f7aa1 100644 |
17 |
--- a/glep-0066.rst |
18 |
+++ b/glep-0066.rst |
19 |
@@ -82,10 +82,10 @@ of implicit ``git pull`` merges is entirely forbidden. |
20 |
In a merge commit that is committed straight to the Gentoo repository, |
21 |
the first parent is expected to reference an actual Gentoo commit |
22 |
preceding the merge, while the remaining parents can be used to |
23 |
-reference external repositories. The commits following the first parent |
24 |
-are required to conform to this specification alike regular Gentoo |
25 |
-commits. The additional commits following other parents can use relaxed |
26 |
-rules. |
27 |
+reference commits originating from external repositories. The commits |
28 |
+on the ancestry path of the first parent (up to the next merge commit) |
29 |
+are required to conform to this specification. The commits on remaining |
30 |
+ancestry paths can use relaxed rules. |
31 |
|
32 |
|
33 |
OpenPGP signatures |