From 37a4eaff453f2c1bbec1b47152bff97458621413 Mon Sep 17 00:00:00 2001 From: John Woods Date: Wed, 3 Jul 2019 00:42:38 +0000 Subject: Update doc/user/project/merge_requests/squash_and_merge.md --- doc/user/project/merge_requests/squash_and_merge.md | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) 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 -- cgit v1.2.1