From 7ba3995c3ad938e204f748b58ebe5356209e14ab Mon Sep 17 00:00:00 2001 From: Marcus Holl Date: Wed, 17 Dec 2014 14:01:31 +0100 Subject: [PATCH] Fix documentation for merge strategy 'fast-forward-only' 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 --- Documentation/project-configuration.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Documentation/project-configuration.txt b/Documentation/project-configuration.txt index 439fbc5ed3..94af04f83c 100644 --- a/Documentation/project-configuration.txt +++ b/Documentation/project-configuration.txt @@ -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