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
c4e9521f
Commit
c4e9521f
authored
Sep 05, 2016
by
Achilleas Pipinellis
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Do not show deprecated docs for now
parent
16093cc1
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
20 additions
and
14 deletions
+20
-14
doc/user/project/merge_requests/fast_forward_merge.md
doc/user/project/merge_requests/fast_forward_merge.md
+19
-0
doc/user/project/merge_requests/img/ff_merge.png
doc/user/project/merge_requests/img/ff_merge.png
+0
-0
doc/workflow/README.md
doc/workflow/README.md
+0
-2
doc/workflow/ff_merge.md
doc/workflow/ff_merge.md
+1
-12
No files found.
doc/user/project/merge_requests/fast_forward_merge.md
0 → 100644
View file @
c4e9521f
# Fast-forward merge
GitLab Enterprise Edition offers a way to accept merge requests without creating
merge commits. If you prefer a linear git history, this might be a good feature
for you.
You can configure this on a per-project basis by navigating to the project
settings page and selecting the
**Only fast-forward merging**
checkbox.
![
Fast forward merge in project settings
](
img/ff_merge.png
)
Now, when you visit the merge request page, you will be able to
**
accept it only
if a fast-forward merge is possible
**
.
If the target branch is ahead of the source branch, you need to rebase the
source branch before you will be able to do a fast-forward merge.
For simple rebase operations, you can use the
[
rebase before merge
](
rebase_before_merge.md
)
feature.
doc/
workflow
/ff_merge.png
→
doc/
user/project/merge_requests/img
/ff_merge.png
View file @
c4e9521f
File moved
doc/workflow/README.md
View file @
c4e9521f
...
...
@@ -35,8 +35,6 @@
-
[
Merge requests versions
](
../user/project/merge_requests/versions.md
)
-
[
"Work In Progress" merge requests
](
../user/project/merge_requests/work_in_progress_merge_requests.md
)
-
(EE)
[
Merge Request Approvals
](
../user/project/merge_requests/merge_request_approvals.md
)
-
(EE)
[
Fast-forward merge
](
ff_merge.md
)
-
(EE)
[
Rebase before merge
](
rebase_before_merge.md
)
-
[
Repository Mirroring
](
repository_mirroring.md
)
-
[
Manage large binaries with Git LFS
](
lfs/manage_large_binaries_with_git_lfs.md
)
-
[
Importing from SVN, GitHub, BitBucket, etc
](
importing/README.md
)
...
...
doc/workflow/ff_merge.md
View file @
c4e9521f
# Fast-forward merge
GitLab Enterprise Edition offers a way to accept merge requests without creating merge commits.
If you prefer a linear git history, this might be a good feature for you.
You can configure this on a per-project basis by navigating to the project settings page and selecting the
**Only fast-forward merging**
checkbox.
![
Merge request settings
](
ff_merge.png
)
Now when you visit the merge request page, you will be able to accept it only if a fast-forward merge is possible.
If the target branch is ahead of the source branch, you need to rebase the source branch before you will be able to do a fast-forward merge.
For simple rebase operations, you can use the
[
Rebase before merge
](
rebase_before_merge.md
)
feature.
This document was moved to
[
user/project/merge_requests/fast_forward_merge
](
../user/project/merge_requests/fast_forward_merge.md
)
.
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