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
08e6a300
Commit
08e6a300
authored
Aug 26, 2020
by
Marcia Ramos
Committed by
Russell Dickenson
Aug 26, 2020
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Docs: clarify how to enable Squash and Merge
parent
9c56c6b9
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
15 additions
and
2 deletions
+15
-2
doc/user/project/merge_requests/squash_and_merge.md
doc/user/project/merge_requests/squash_and_merge.md
+15
-2
No files found.
doc/user/project/merge_requests/squash_and_merge.md
View file @
08e6a300
...
...
@@ -65,14 +65,27 @@ meaningful commit messages and:
## Enabling squash for a merge request
Anyone who can create or edit a merge request can choose for it to be squashed
on the merge request form:
on the merge request form. Users can select or unselect the checkbox at the moment
they are creating the merge request:
![
Squash commits checkbox on edit form
](
img/squash_edit_form.png
)
This can then be overridden at the time of accepting the merge request:
After the merge request is submitted, Squash and Merge can still be enabled or disabled
by editing the merge request description:
1.
Scroll to the top of the merge request page and click
**Edit**
.
1.
Scroll down to the end of the merge request form and select the checkbox
**Squash commits when merge request is accepted**
.
This setting can then be overridden at the time of accepting the merge request.
At the end of the merge request widget, next to the
**Merge**
button, the
**Squash commits**
checkbox
can be either selected or unselected:
![
Squash commits checkbox on accept merge request form
](
img/squash_mr_widget.png
)
Note that Squash and Merge might not be available depending on the project's configuration
for
[
Squash Commit Options
](
#squash-commits-options
)
.
## Commit metadata for squashed commits
The squashed commit has the following metadata:
...
...
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