Commit c4e9521f authored by Achilleas Pipinellis's avatar Achilleas Pipinellis

Do not show deprecated docs for now

parent 16093cc1
# 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.
......@@ -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)
......
# 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).
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment