kotovalexarian-likes-gitlab
/
gitlab-org--gitlab-foss
1
0
Fork 0
Code Releases Activity

Merge branch 'docs-squash-merge-heading' into 'master' 

Update squash_and_merge.md to fix link and description

See merge request gitlab-org/gitlab-ce!20093
This commit is contained in:
Marcia Ramos 2018-06-22 10:11:04 +00:00
parent 70aa92ec66 66d17c5430
commit 348ad22d7a
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
doc/user/project/merge_requests/squash_and_merge.md
View File

@ -1,6 +1,6 @@
# Squash and merge
> [Introduced][ee-1024] in [GitLab Starter][ee] 8.17, and in [GitLab CE][ce] [11.0][ce-18956].
> [Introduced][ee-1024] in [GitLab Starter][ee] 8.17, and in [GitLab Core][ce] [11.0][ce-18956].
Combine all commits of your merge request into one and retain a clean history.
@ -75,6 +75,6 @@ squashing can itself be considered equivalent to rebasing.
[squash-edit-form]: img/squash_edit_form.png
[squash-mr-widget]: img/squash_mr_widget.png
[ff-merge]: fast_forward_merge.md#enabling-fast-forward-merges
[ce]: https://about.gitlab.com/products/
[ee]: https://about.gitlab.com/products/
[ce]: https://about.gitlab.com/pricing/
[ee]: https://about.gitlab.com/pricing/
[revert]: revert_changes.md