From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 1105) id CA87E3848023; Mon, 2 Aug 2021 17:07:28 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org CA87E3848023 Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: Joseph Myers To: gcc-cvs@gcc.gnu.org Subject: [gcc(refs/meta/config)] Treat refs/heads/trunk the same as refs/heads/master X-Act-Checkin: gcc X-Git-Author: Joseph Myers X-Git-Refname: refs/meta/config X-Git-Oldrev: e57cd600d8a9b4f05d77ba7dd4d12301e112c625 X-Git-Newrev: f03579097c2c0a7c0545f23d0809ba60ba905f8c Message-Id: <20210802170728.CA87E3848023@sourceware.org> Date: Mon, 2 Aug 2021 17:07:28 +0000 (GMT) X-BeenThere: gcc-cvs@gcc.gnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Gcc-cvs mailing list List-Unsubscribe: , List-Archive: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 02 Aug 2021 17:07:28 -0000 https://gcc.gnu.org/g:f03579097c2c0a7c0545f23d0809ba60ba905f8c commit f03579097c2c0a7c0545f23d0809ba60ba905f8c Author: Joseph Myers Date: Mon Aug 2 17:06:09 2021 +0000 Treat refs/heads/trunk the same as refs/heads/master Diff: --- project.config | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project.config b/project.config index c5ea40fa371..b7bdaf30b9e 100644 --- a/project.config +++ b/project.config @@ -16,7 +16,7 @@ # git newcomers). # - on release: We apply the same policy to release branches # as we have on master. - reject-merge-commits = refs/heads/master,refs/heads/releases/.* + reject-merge-commits = refs/heads/master,refs/heads/trunk,refs/heads/releases/.* # The URL where we can inspect the commit, inserted in the commit # notification email, and also copy sent to the file-commit-cmd.