From 749033e38829d09a8312a8e39925fa469ef92e22 Mon Sep 17 00:00:00 2001 From: David Pursehouse Date: Tue, 16 Jul 2019 08:52:14 +0900 Subject: [PATCH] project-configuration: Improve wording of 'Fast Forward Only' Change-Id: Iec509c1eb50abebf36f7724b41984147743e5d74 --- Documentation/project-configuration.txt | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/Documentation/project-configuration.txt b/Documentation/project-configuration.txt index 9272e4b259..539ec27340 100644 --- a/Documentation/project-configuration.txt +++ b/Documentation/project-configuration.txt @@ -60,8 +60,9 @@ The following submit types are supported: [[fast_forward_only]] * Fast Forward Only + -With this method no merge commits are produced. All merges must -be handled on the client, prior to uploading to Gerrit for review. +With this method Gerrit does not create merge commits on submitting a +change. Merge commits may still be submitted, but they must be created +on the client prior to uploading to Gerrit for review. + To submit a change, the change must be a strict superset of the destination branch. That is, the change must already contain the