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
5fa0c2bb
Commit
5fa0c2bb
authored
Jul 22, 2021
by
Marcia Ramos
Committed by
Amy Qualls
Jul 22, 2021
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Docs: Add the rebase quick action to the rebase doc
parent
d2ecadaa
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
21 additions
and
0 deletions
+21
-0
doc/topics/git/git_rebase.md
doc/topics/git/git_rebase.md
+21
-0
No files found.
doc/topics/git/git_rebase.md
View file @
5fa0c2bb
...
...
@@ -123,6 +123,27 @@ them before continuing the rebase.
To learn more, check Git's documentation on
[
rebasing
](
https://git-scm.com/book/en/v2/Git-Branching-Rebasing
)
and
[
rebasing strategies
](
https://git-scm.com/book/en/v2/Git-Branching-Rebasing
)
.
#### Rebase from the GitLab UI
You can rebase your feature branch directly from the merge request through a
[
quick action
](
../../user/project/quick_actions.md#issues-merge-requests-and-epics
)
,
if all of these conditions are met:
-
No
[
merge conflicts
](
#merge-conflicts
)
exist for your feature branch.
-
You have the
**Developer**
role for the source project. This role grants you
permission to push to the source branch for the source project.
-
If the merge request is in a fork, the fork must allow commits
[
from members of the upstream project
](
../../user/project/merge_requests/allow_collaboration.md
)
.
To rebase from the UI:
1.
Go to your merge request.
1.
Type
`/rebase`
in a comment.
1.
Select
**Comment**
.
GitLab schedules a rebase of the feature branch against the default branch and
executes it as soon as possible.
### Interactive rebase
You can use interactive rebase to modify commits. For example, amend a commit
...
...
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