debian-mirror-gitlab/doc/user/project/merge_requests/cherry_pick_changes.md

42 lines
1.5 KiB
Markdown
Raw Normal View History

2016-09-29 09:46:39 +05:30
# Cherry-pick changes
> [Introduced][ce-3514] in GitLab 8.7.
GitLab implements Git's powerful feature to [cherry-pick any commit][git-cherry-pick]
2018-03-17 18:26:18 +05:30
with introducing a **Cherry-pick** button in merge requests and commit details.
2016-09-29 09:46:39 +05:30
2018-03-17 18:26:18 +05:30
## Cherry-picking a merge request
2016-09-29 09:46:39 +05:30
2018-03-17 18:26:18 +05:30
After the merge request has been merged, a **Cherry-pick** button will be available
to cherry-pick the changes introduced by that merge request.
2016-09-29 09:46:39 +05:30
![Cherry-pick Merge Request](img/cherry_pick_changes_mr.png)
2018-03-17 18:26:18 +05:30
After you click that button, a modal will appear where you can choose to
cherry-pick the changes directly into the selected branch or you can opt to
create a new merge request with the cherry-pick changes
2016-09-29 09:46:39 +05:30
## Cherry-picking a Commit
You can cherry-pick a Commit from the Commit details page:
![Cherry-pick commit](img/cherry_pick_changes_commit.png)
2018-03-17 18:26:18 +05:30
Similar to cherry-picking a merge request, you can opt to cherry-pick the changes
directly into the target branch or create a new merge request to cherry-pick the
changes.
2016-09-29 09:46:39 +05:30
Please note that when cherry-picking merge commits, the mainline will always be the
first parent. If you want to use a different mainline then you need to do that
from the command line.
Here is a quick example to cherry-pick a merge commit using the second parent as the
mainline:
```bash
git cherry-pick -m 2 7a39eb0
```
[ce-3514]: https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/3514 "Cherry-pick button Merge Request"
[git-cherry-pick]: https://git-scm.com/docs/git-cherry-pick "Git cherry-pick documentation"