diff options
author | Sean McGivern <sean@gitlab.com> | 2019-02-07 18:46:34 +0300 |
---|---|---|
committer | Sean McGivern <sean@gitlab.com> | 2019-02-07 18:46:34 +0300 |
commit | 5f90d92c10e89d60a5a6d9c59da8e480fd12d8de (patch) | |
tree | 5e8734ef66f824e9148a9ca52e700fa58baae0be /doc | |
parent | c3da8849c364885841fddf592346974ff4148c8d (diff) | |
parent | f4f3f286f1c6bc37133fe775862e7340d7b56f1e (diff) |
Merge branch 'master' into fabsrc/gitlab-ce-2105-add-setting-for-first-day-of-the-week
Diffstat (limited to 'doc')
-rw-r--r-- | doc/user/project/merge_requests/img/squash_mr_message.png | bin | 0 -> 150302 bytes | |||
-rw-r--r-- | doc/user/project/merge_requests/squash_and_merge.md | 15 |
2 files changed, 9 insertions, 6 deletions
diff --git a/doc/user/project/merge_requests/img/squash_mr_message.png b/doc/user/project/merge_requests/img/squash_mr_message.png Binary files differnew file mode 100644 index 00000000000..8734cab29aa --- /dev/null +++ b/doc/user/project/merge_requests/img/squash_mr_message.png diff --git a/doc/user/project/merge_requests/squash_and_merge.md b/doc/user/project/merge_requests/squash_and_merge.md index 34cba867e2c..4ff8ec3a7e6 100644 --- a/doc/user/project/merge_requests/squash_and_merge.md +++ b/doc/user/project/merge_requests/squash_and_merge.md @@ -23,11 +23,14 @@ The squashed commit's commit message will be either: - Taken from the first multi-line commit message in the merge. - The merge request's title if no multi-line commit message is found. -Note that the squashed commit is still followed by a merge commit, -as the merge method for this example repository uses a merge commit. -Squashing also works with the fast-forward merge strategy, see -[squashing and fast-forward merge](#squash-and-fast-forward-merge) for more -details. +It can be customized before merging a merge request. + +![A squash commit message editor](img/squash_mr_message.png) + +NOTE: **Note:** +The squashed commit in this example is followed by a merge commit, as the merge method for this example repository uses a merge commit. + +Squashing also works with the fast-forward merge strategy, see [squashing and fast-forward merge](#squash-and-fast-forward-merge) for more details. ## Use cases @@ -60,7 +63,7 @@ This can then be overridden at the time of accepting the merge request: The squashed commit has the following metadata: -- Message: the message of the squash commit. +- Message: the message of the squash commit, or a customized message. - Author: the author of the merge request. - Committer: the user who initiated the squash. |