summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEvan Read <eread@gitlab.com>2019-07-01 02:33:24 +0000
committerEvan Read <eread@gitlab.com>2019-07-01 02:33:24 +0000
commit5e3fb09cc4a39cb1b27b71f3a52c42bec7e5ddfa (patch)
tree87f810c198a69ab9695f26139f540728916905d9
parent89eb88255705ad0f67e73061940000c9de127e30 (diff)
downloadgitlab-ce-jwoods06-master-patch-41260.tar.gz
Apply suggestion to doc/user/project/merge_requests/squash_and_merge.mdjwoods06-master-patch-41260
-rw-r--r--doc/user/project/merge_requests/squash_and_merge.md1
1 files changed, 0 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 72336ccd080..38459584eed 100644
--- a/doc/user/project/merge_requests/squash_and_merge.md
+++ b/doc/user/project/merge_requests/squash_and_merge.md
@@ -54,7 +54,6 @@ meaningful commit messages and:
- It's simpler to [revert](revert_changes.md) if necessary.
- The merged branch will retain the full commit history.
-and the merged branch will retain the full commit history.
## Enabling squash for a merge request