diff options
Diffstat (limited to 'doc/user/project/merge_requests/fast_forward_merge.md')
-rw-r--r-- | doc/user/project/merge_requests/fast_forward_merge.md | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/doc/user/project/merge_requests/fast_forward_merge.md b/doc/user/project/merge_requests/fast_forward_merge.md index 7edc379399b..078f8048900 100644 --- a/doc/user/project/merge_requests/fast_forward_merge.md +++ b/doc/user/project/merge_requests/fast_forward_merge.md @@ -38,6 +38,8 @@ Now, when you visit the merge request page, you can accept it If a fast-forward merge is not possible but a conflict free rebase is possible, a rebase button is offered. +The rebase action is also available as a [quick action command: `/rebase`](../../../topics/git/git_rebase.md#rebase-from-the-gitlab-ui). + ![Fast forward merge request](img/ff_merge_rebase.png) If the target branch is ahead of the source branch and a conflict free rebase is |