diff options
| author | Evan Read <eread@gitlab.com> | 2019-07-03 00:42:38 +0000 |
|---|---|---|
| committer | Evan Read <eread@gitlab.com> | 2019-07-03 00:42:38 +0000 |
| commit | 277d34ef998b87e985d750728de3d5bd669f3cff (patch) | |
| tree | a11d98ca2688f436fa1280d329025ee61b1b5b9e | |
| parent | 4aa98d31e51ea0f7debdbc160b828a4d3d242884 (diff) | |
| parent | 37a4eaff453f2c1bbec1b47152bff97458621413 (diff) | |
| download | gitlab-ce-277d34ef998b87e985d750728de3d5bd669f3cff.tar.gz | |
Merge branch 'jwoods06-master-patch-41260' into 'master'
Update doc/user/project/merge_requests/squash_and_merge.md
See merge request gitlab-org/gitlab-ce!30103
| -rw-r--r-- | doc/user/project/merge_requests/squash_and_merge.md | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/doc/user/project/merge_requests/squash_and_merge.md b/doc/user/project/merge_requests/squash_and_merge.md index 39fd2588811..38459584eed 100644 --- a/doc/user/project/merge_requests/squash_and_merge.md +++ b/doc/user/project/merge_requests/squash_and_merge.md @@ -50,7 +50,10 @@ all you have to do is enable squashing before you press merge to join the commits in the merge request into a single commit. This way, the history of your base branch remains clean with -meaningful commit messages and is simpler to [revert](revert_changes.md) if necessary. +meaningful commit messages and: + +- It's simpler to [revert](revert_changes.md) if necessary. +- The merged branch will retain the full commit history. ## Enabling squash for a merge request |