From 99aeeeaf0dc3fc9c55932109a018f69686715ed5 Mon Sep 17 00:00:00 2001 From: David Pursehouse Date: Tue, 16 Jul 2019 08:38:15 +0900 Subject: [PATCH 1/3] project-configuration: Fix formatting in submit type section Change-Id: Ie01696d6cf22e86245e3627c20c27c8b8edf1b68 --- Documentation/project-configuration.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Documentation/project-configuration.txt b/Documentation/project-configuration.txt index 8518d292a3..9272e4b259 100644 --- a/Documentation/project-configuration.txt +++ b/Documentation/project-configuration.txt @@ -114,7 +114,7 @@ If the change being submitted is a strict superset of the destination branch, then the branch is fast-forwarded to the change. If not, then the change is automatically rebased and then the branch is fast-forwarded to the change. - ++ When Gerrit tries to do a merge, by default the merge will only succeed if there is no path conflict. A path conflict occurs when the same file has also been changed on the other side of the merge. @@ -126,7 +126,7 @@ Basically, the same as Rebase If Necessary, but it creates a new patchset even if fast forward is possible AND like Cherry Pick it ensures footers such as Change-Id, Reviewed-On, and others are present in resulting commit that is merged. - ++ Thus, Rebase Always can be considered similar to Cherry Pick, but with the important distinction that Rebase Always does not ignore dependencies. From 91203c9257e85ed3edd1f5d24298bd0cbbf472b1 Mon Sep 17 00:00:00 2001 From: David Pursehouse Date: Tue, 16 Jul 2019 08:49:29 +0900 Subject: [PATCH 2/3] config-project-config: Add missing 'rebase always' Change-Id: I499c092d1ea7947f77afb3687459635064004111 --- Documentation/config-project-config.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Documentation/config-project-config.txt b/Documentation/config-project-config.txt index 016c8468a7..653f976bea 100644 --- a/Documentation/config-project-config.txt +++ b/Documentation/config-project-config.txt @@ -248,7 +248,7 @@ are 'true', 'false', or 'INHERIT'. Default is 'INHERIT'. - 'action': defines the link:project-configuration.html#submit_type[submit type]. Valid values are 'fast forward only', 'merge if necessary', 'rebase if necessary', -'merge always' and 'cherry pick'. The default is 'merge if necessary'. +'rebase always', 'merge always' and 'cherry pick'. The default is 'merge if necessary'. - 'matchAuthorToCommitterDate': Defines whether to the author date will be changed to match the submitter date upon submit, so that git log shows when the change was submitted instead of when the From 749033e38829d09a8312a8e39925fa469ef92e22 Mon Sep 17 00:00:00 2001 From: David Pursehouse Date: Tue, 16 Jul 2019 08:52:14 +0900 Subject: [PATCH 3/3] 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