From d3224e71b453f55e5e49651461a13547c06d65c0 Mon Sep 17 00:00:00 2001
From: Jeremy Stanley <fungi@yuggoth.org>
Date: Mon, 5 Jun 2023 22:12:33 +0000
Subject: [PATCH] Enable receive.rejectImplicitMerges for Gerrit

Document our intent to enforce the rejectImplicitMerges option for
receipt of changes, in order to avoid silently merging the target
branch to include the change's history from another branch where
those commits are already present.

Change-Id: I7478825ed58c5a4e7cf29d06a770e70c7b5a7759
---
 doc/source/gerrit.rst | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/doc/source/gerrit.rst b/doc/source/gerrit.rst
index 2574a7b04b..0116ff5f75 100644
--- a/doc/source/gerrit.rst
+++ b/doc/source/gerrit.rst
@@ -335,6 +335,9 @@ Next, edit ``project.config`` to look like::
   [project]
   description = Rights inherited by all other projects
 
+  [receive]
+  rejectImplicitMerges = true
+
 Now edit the groups file. The format is::
 
   #UUID  Group Name