diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-03-16 21:09:21 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-03-16 21:09:21 +0000 |
| commit | 87af6f2e0590af0ed1bb3e5de1bb5d21855a94d2 (patch) | |
| tree | 2abe2661b10cf6281bc03855b3053a072c64fbbf /doc/user/project/merge_requests/cherry_pick_changes.md | |
| parent | c43ba2677f41ad0b5fc6f3af6baf4266c70dfcb3 (diff) | |
| download | gitlab-ce-87af6f2e0590af0ed1bb3e5de1bb5d21855a94d2.tar.gz | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'doc/user/project/merge_requests/cherry_pick_changes.md')
| -rw-r--r-- | doc/user/project/merge_requests/cherry_pick_changes.md | 14 |
1 files changed, 14 insertions, 0 deletions
diff --git a/doc/user/project/merge_requests/cherry_pick_changes.md b/doc/user/project/merge_requests/cherry_pick_changes.md index 1ba5ece89d5..3e76b9ec6b9 100644 --- a/doc/user/project/merge_requests/cherry_pick_changes.md +++ b/doc/user/project/merge_requests/cherry_pick_changes.md @@ -21,6 +21,20 @@ where you can choose to either: - Cherry-pick the changes directly into the selected branch. - Create a new merge request with the cherry-picked changes. +### Cherry-pick tracking + +> [Introduced](https://gitlab.com/groups/gitlab-org/-/epics/2675) in GitLab 12.9. + +When you cherry-pick a merge commit, GitLab will output a system note to the related merge +request thread crosslinking the new commit and the existing merge request. + + + +Each deployment's [list of associated merge requests](../../../api/deployments.md#list-of-merge-requests-associated-with-a-deployment) will include cherry-picked merge commits. + +NOTE: **Note:** +We only track cherry-pick executed from GitLab (both UI and API). Support for [tracking cherry-picked commits through the command line](https://gitlab.com/gitlab-org/gitlab/issues/202215) is planned for a future release. + ## Cherry-picking a commit You can cherry-pick a commit from the commit details page: |