diff options
| author | Valery Sizov <valery@gitlab.com> | 2017-09-29 19:42:16 +0300 |
|---|---|---|
| committer | Valery Sizov <valery@gitlab.com> | 2017-09-29 19:42:16 +0300 |
| commit | 29b2efb61085017eea21c3fa8e7486cdb15054a4 (patch) | |
| tree | b0c7a394d6db896fca7c44cb106268247db4c408 | |
| parent | 689985f7c30f8481444cde8ddbb5b3af50c9c95f (diff) | |
| download | gitlab-ce-29b2efb61085017eea21c3fa8e7486cdb15054a4.tar.gz | |
Backport documentation for semi-linear history
| -rw-r--r-- | doc/user/project/merge_requests/index.md | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/doc/user/project/merge_requests/index.md b/doc/user/project/merge_requests/index.md index 00e1f336702..edd07610f07 100644 --- a/doc/user/project/merge_requests/index.md +++ b/doc/user/project/merge_requests/index.md @@ -24,6 +24,7 @@ With GitLab merge requests, you can: - Add a time estimation and the time spent with that merge request with [Time Tracking](../../../workflow/time_tracking.html#time-tracking) - [Resolve merge conflicts from the UI](#resolve-conflicts) - Enable [fast-forward merge requests](#fast-forward-merge-requests) +- Enable [semi-linear history merge requests](#semi-linear-history-merge-requests) as another security layer to guarantee the pipeline is passing in the target branch With **[GitLab Enterprise Edition][ee]**, you can also: @@ -90,6 +91,17 @@ in a merged merge requests or a commit. [Learn more about cherry-picking changes.](cherry_pick_changes.md) +## Semi-linear history merge requests + +> Included in [GitLab Enterprise Edition Starter][products]. + +A merge commit is created for every merge, but the branch is only merged if +a fast-forward merge is possible. This ensures that if the merge request build +succeeded, the target branch build will also succeed after merging. + +Navigate to a project's settings, select the **Merge commit with semi-linear +history** option under **Merge Requests: Merge method** and save your changes. + ## Fast-forward merge requests If you prefer a linear Git history and a way to accept merge requests without |