summaryrefslogtreecommitdiff
path: root/doc/workflow
diff options
context:
space:
mode:
authorAchilleas Pipinellis <axilleas@axilleas.me>2016-09-05 13:40:41 +0200
committerAchilleas Pipinellis <axilleas@axilleas.me>2016-09-05 13:40:41 +0200
commit14a96a1ad2d96078cbd73a60e260601f47373060 (patch)
tree507b39585ca16b32793b60b70b32e30a1d79a531 /doc/workflow
parent99e03f80ca875d261622268cf11eb63a02ae2bf5 (diff)
downloadgitlab-ce-14a96a1ad2d96078cbd73a60e260601f47373060.tar.gz
Move cherry_pick_changes.md to new location
Diffstat (limited to 'doc/workflow')
-rw-r--r--doc/workflow/cherry_pick_changes.md53
-rw-r--r--doc/workflow/img/cherry_pick_changes_commit.pngbin304098 -> 0 bytes
-rw-r--r--doc/workflow/img/cherry_pick_changes_commit_modal.pngbin264883 -> 0 bytes
-rw-r--r--doc/workflow/img/cherry_pick_changes_mr.pngbin212267 -> 0 bytes
-rw-r--r--doc/workflow/img/cherry_pick_changes_mr_modal.pngbin186597 -> 0 bytes
5 files changed, 1 insertions, 52 deletions
diff --git a/doc/workflow/cherry_pick_changes.md b/doc/workflow/cherry_pick_changes.md
index 64b94d81024..663ffd3f746 100644
--- a/doc/workflow/cherry_pick_changes.md
+++ b/doc/workflow/cherry_pick_changes.md
@@ -1,52 +1 @@
-# 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"
+This document was moved to [user/project/merge_requests/cherry_pick_changes](../user/project/merge_requests/cherry_pick_changes.md).
diff --git a/doc/workflow/img/cherry_pick_changes_commit.png b/doc/workflow/img/cherry_pick_changes_commit.png
deleted file mode 100644
index 7fb68cc9e9b..00000000000
--- a/doc/workflow/img/cherry_pick_changes_commit.png
+++ /dev/null
Binary files differ
diff --git a/doc/workflow/img/cherry_pick_changes_commit_modal.png b/doc/workflow/img/cherry_pick_changes_commit_modal.png
deleted file mode 100644
index 5267e04562f..00000000000
--- a/doc/workflow/img/cherry_pick_changes_commit_modal.png
+++ /dev/null
Binary files differ
diff --git a/doc/workflow/img/cherry_pick_changes_mr.png b/doc/workflow/img/cherry_pick_changes_mr.png
deleted file mode 100644
index 975fb13e463..00000000000
--- a/doc/workflow/img/cherry_pick_changes_mr.png
+++ /dev/null
Binary files differ
diff --git a/doc/workflow/img/cherry_pick_changes_mr_modal.png b/doc/workflow/img/cherry_pick_changes_mr_modal.png
deleted file mode 100644
index 6c003bacbe3..00000000000
--- a/doc/workflow/img/cherry_pick_changes_mr_modal.png
+++ /dev/null
Binary files differ