Commit Graph

12 Commits

Author SHA1 Message Date
GitLab Bot c3b45354d7 Add latest changes from gitlab-org/gitlab@master 2020-07-09 09:09:27 +00:00
GitLab Bot e5d314d432 Add latest changes from gitlab-org/gitlab@master 2020-07-03 15:09:13 +00:00
GitLab Bot 7c38405be9 Add latest changes from gitlab-org/gitlab@master 2020-03-10 15:08:08 +00:00
GitLab Bot 0eb3d2f799 Add latest changes from gitlab-org/gitlab@master 2020-02-06 15:09:11 +00:00
GitLab Bot 80f61b4035 Add latest changes from gitlab-org/gitlab@master 2019-09-18 14:02:45 +00:00
John Woods 37a4eaff45 Update doc/user/project/merge_requests/squash_and_merge.md 2019-07-03 00:42:38 +00:00
Achilleas Pipinellis fb9f1e92ed Single source of truth for merge requests
- Edit pages under user/project/merge_requests and
  add the relevant types in the frontmatter.
- Clean up descriptions.

Based on https://gitlab.com/groups/gitlab-org/-/epics/1280
2019-06-09 22:25:13 +00:00
Natalia Tepluhina 407fd2edc7 Resolve "Override squash commit message" 2019-02-07 15:14:56 +00:00
Luke Duncalfe 2b7dd017af Allow custom squash commit messages 2019-02-06 12:33:11 +00:00
Evan Read d98560c1f5 Make unordered lists conform to styleguide
- Also makes other minor Markdown fixes that were near the main fixes.
2019-01-08 12:21:09 +10:00
Marcel Amirault 66d17c5430
Update squash_and_merge.md to fix link and description
(cherry picked from commit b5ea33397eb8d2c874662026b0e36aed7c41dbbc)
2018-06-22 12:06:36 +02:00
blackst0ne 4cff66a6c4 Add 'squash and rebase' feature to CE 2018-05-29 20:51:43 +11:00