Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
1
Merge Requests
1
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
nexedi
gitlab-ce
Commits
fc61b288
Commit
fc61b288
authored
Mar 06, 2017
by
Sean Packham (GitLab)
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Added semi-linear history merge docs
parent
c601ca55
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
11 additions
and
0 deletions
+11
-0
doc/user/project/merge_requests/index.md
doc/user/project/merge_requests/index.md
+11
-0
No files found.
doc/user/project/merge_requests/index.md
View file @
fc61b288
...
...
@@ -85,6 +85,17 @@ list of approvers that will need to approve every merge request in a project.
[
Read more about merge request approvals.
](
merge_request_approvals.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
suceedeed, 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
> Included in [GitLab Enterprise Edition Starter][products].
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment