[binutils-gdb(refs/meta/config)] project.config: minor change in how reject-merge-commits is defined

Joel Brobecker brobecke@sourceware.org
Mon Aug 10 16:55:34 GMT 2020


https://sourceware.org/git/gitweb.cgi?p=binutils-gdb.git;h=cff60acf6db71188ac9661cf264421d95f55f102

commit cff60acf6db71188ac9661cf264421d95f55f102
Author: Joel Brobecker <brobecker@adacore.com>
Date:   Mon Aug 10 09:45:57 2020 -0700

    project.config: minor change in how reject-merge-commits is defined
    
    Use the prefered way to provide entries to a config option which is
    a list (one entry per item, instead of one entry with coma-separated
    items).

Diff:
---
 project.config | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/project.config b/project.config
index 4168ed8a655..deb32005a21 100644
--- a/project.config
+++ b/project.config
@@ -15,7 +15,8 @@
         #    commit is a merge from master into the branch, which would
         #    bring a lot more than what the user probably meant to push.
         #    Request that the user cherry-pick his changes.
-        reject-merge-commits = refs/heads/master,refs/heads/gdb-.*
+        reject-merge-commits = refs/heads/master
+        reject-merge-commits = refs/heads/gdb-.*
 
         # The style checker, applied to the contents of each file being
         # modified.


More information about the Gdb-cvs mailing list