opendev/gerrit
Code Issues Proposed changes

Fix documentation for merge strategy 'fast-forward-only'

Browse Source 
The documentation for merge strategy 'fast-forward-only' asserts that
fast-forward-only produces a strictly linear history. But even with
fast-forward-only it is possible to produce histories not being strictly
linear. E.g. some predecessors of the change being pushed might be
merge commits. The point is that by submitting a change no merge
commit will be created when merge strategy is fast-forward-only.

Change-Id: Ia68e6bac7fb49b1398971e7a23d4277f1ca51b06
This commit is contained in:
Marcus Holl
2014-12-17 14:01:31 +01:00
committed by Shawn Pearce
parent 0bff12741c
commit 7ba3995c3a
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Documentation/project-configuration.txt
View File

@@ -58,7 +58,7 @@ modified by any project owner through the project console, `Projects` >
[[fast_forward_only]]
* Fast Forward Only
+
This method produces a strictly linear history. All merges must
With this method no merge commits are produced. All merges must
be handled on the client, prior to uploading to Gerrit for review.
+
To submit a change, the change must be a strict superset of the