From 14a96a1ad2d96078cbd73a60e260601f47373060 Mon Sep 17 00:00:00 2001 From: Achilleas Pipinellis Date: Mon, 5 Sep 2016 13:40:41 +0200 Subject: Move cherry_pick_changes.md to new location --- .../project/merge_requests/cherry_pick_changes.md | 52 +++++++++++++++++++++ .../img/cherry_pick_changes_commit.png | Bin 0 -> 304098 bytes .../img/cherry_pick_changes_commit_modal.png | Bin 0 -> 264883 bytes .../merge_requests/img/cherry_pick_changes_mr.png | Bin 0 -> 212267 bytes .../img/cherry_pick_changes_mr_modal.png | Bin 0 -> 186597 bytes 5 files changed, 52 insertions(+) create mode 100644 doc/user/project/merge_requests/cherry_pick_changes.md create mode 100644 doc/user/project/merge_requests/img/cherry_pick_changes_commit.png create mode 100644 doc/user/project/merge_requests/img/cherry_pick_changes_commit_modal.png create mode 100644 doc/user/project/merge_requests/img/cherry_pick_changes_mr.png create mode 100644 doc/user/project/merge_requests/img/cherry_pick_changes_mr_modal.png (limited to 'doc/user/project/merge_requests') diff --git a/doc/user/project/merge_requests/cherry_pick_changes.md b/doc/user/project/merge_requests/cherry_pick_changes.md new file mode 100644 index 00000000000..64b94d81024 --- /dev/null +++ b/doc/user/project/merge_requests/cherry_pick_changes.md @@ -0,0 +1,52 @@ +# Cherry-pick changes + +> [Introduced][ce-3514] in GitLab 8.7. + +--- + +GitLab implements Git's powerful feature to [cherry-pick any commit][git-cherry-pick] +with introducing a **Cherry-pick** button in Merge Requests and commit details. + +## Cherry-picking a Merge Request + +After the Merge Request has been merged, a **Cherry-pick** button will be available +to cherry-pick the changes introduced by that Merge Request: + +![Cherry-pick Merge Request](img/cherry_pick_changes_mr.png) + +--- + +You can cherry-pick the changes directly into the selected branch or you can opt to +create a new Merge Request with the cherry-pick changes: + +![Cherry-pick Merge Request modal](img/cherry_pick_changes_mr_modal.png) + +## Cherry-picking a Commit + +You can cherry-pick a Commit from the Commit details page: + +![Cherry-pick commit](img/cherry_pick_changes_commit.png) + +--- + +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: + +![Cherry-pick commit modal](img/cherry_pick_changes_commit_modal.png) + +--- + +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" diff --git a/doc/user/project/merge_requests/img/cherry_pick_changes_commit.png b/doc/user/project/merge_requests/img/cherry_pick_changes_commit.png new file mode 100644 index 00000000000..7fb68cc9e9b Binary files /dev/null and b/doc/user/project/merge_requests/img/cherry_pick_changes_commit.png differ diff --git a/doc/user/project/merge_requests/img/cherry_pick_changes_commit_modal.png b/doc/user/project/merge_requests/img/cherry_pick_changes_commit_modal.png new file mode 100644 index 00000000000..5267e04562f Binary files /dev/null and b/doc/user/project/merge_requests/img/cherry_pick_changes_commit_modal.png differ diff --git a/doc/user/project/merge_requests/img/cherry_pick_changes_mr.png b/doc/user/project/merge_requests/img/cherry_pick_changes_mr.png new file mode 100644 index 00000000000..975fb13e463 Binary files /dev/null and b/doc/user/project/merge_requests/img/cherry_pick_changes_mr.png differ diff --git a/doc/user/project/merge_requests/img/cherry_pick_changes_mr_modal.png b/doc/user/project/merge_requests/img/cherry_pick_changes_mr_modal.png new file mode 100644 index 00000000000..6c003bacbe3 Binary files /dev/null and b/doc/user/project/merge_requests/img/cherry_pick_changes_mr_modal.png differ -- cgit v1.2.3