home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-27 13:36:06 +10:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'doc_rebase' into 'master'

Browse Source 
separate documentation for rebase before merge

fixes https://dev.gitlab.org/gitlab/gitlabhq/issues/2108

See merge request !350
This commit is contained in:
Sytse Sijbrandij
2015-03-13 00:05:06 +00:00
parent 49901eb315 c30629e15f
commit 42ebefc3e9
2 changed files with 12 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
doc/workflow/README.md
+1
View File
@@ -3,6 +3,7 @@
- [Feature branch workflow](workflow.md)
- [Project Features](project_features.md)
- [Authorization for merge requests](authorization_for_merge_requests.md)
- [Rebase before merge](rebase_before_merge.md)
- [Groups](groups.md)
- [Share projects with other groups](share_projects_with_other_groups.md)
- [Labels](labels.md)
doc/workflow/rebase_before_merge.md
+11
View File
@@ -0,0 +1,11 @@
#Rebase before merge
GitLab Enterprise Edition offers a way to rebase before merging a merge request. You can configure this per project basis by navigating to the project settings page and selecting `Merge Requests Rebase` checkbox.
![Merge request settings](merge_request_settings.png)
Before accepting a merge request, select `rebase before merge`.
![Merge request widget](merge_request_widget.png)
GitLab will attempt to cleanly rebase before merging branches. If clean rebase is not possible, regular merge will be performed.
If clean rebase is possible and history of the traget branch will be altered with the the merge.