Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Jérome Perrin
gitlab-ce
Commits
14a96a1a
Commit
14a96a1a
authored
Sep 05, 2016
by
Achilleas Pipinellis
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Move cherry_pick_changes.md to new location
parent
99e03f80
Changes
7
Hide whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
54 additions
and
53 deletions
+54
-53
doc/intro/README.md
doc/intro/README.md
+1
-1
doc/user/project/merge_requests/cherry_pick_changes.md
doc/user/project/merge_requests/cherry_pick_changes.md
+52
-0
doc/user/project/merge_requests/img/cherry_pick_changes_commit.png
...project/merge_requests/img/cherry_pick_changes_commit.png
+0
-0
doc/user/project/merge_requests/img/cherry_pick_changes_commit_modal.png
...t/merge_requests/img/cherry_pick_changes_commit_modal.png
+0
-0
doc/user/project/merge_requests/img/cherry_pick_changes_mr.png
...ser/project/merge_requests/img/cherry_pick_changes_mr.png
+0
-0
doc/user/project/merge_requests/img/cherry_pick_changes_mr_modal.png
...oject/merge_requests/img/cherry_pick_changes_mr_modal.png
+0
-0
doc/workflow/cherry_pick_changes.md
doc/workflow/cherry_pick_changes.md
+1
-52
No files found.
doc/intro/README.md
View file @
14a96a1a
...
@@ -25,7 +25,7 @@ Create merge requests and review code.
...
@@ -25,7 +25,7 @@ Create merge requests and review code.
-
[
Automatically close issues from merge requests
](
../customization/issue_closing.md
)
-
[
Automatically close issues from merge requests
](
../customization/issue_closing.md
)
-
[
Automatically merge when your builds succeed
](
../user/project/merge_requests/merge_when_build_succeeds.md
)
-
[
Automatically merge when your builds succeed
](
../user/project/merge_requests/merge_when_build_succeeds.md
)
-
[
Revert any commit
](
../workflow/revert_changes.md
)
-
[
Revert any commit
](
../workflow/revert_changes.md
)
-
[
Cherry-pick any commit
](
../
workflow
/cherry_pick_changes.md
)
-
[
Cherry-pick any commit
](
../
user/project/merge_requests
/cherry_pick_changes.md
)
## Test and Deploy
## Test and Deploy
...
...
doc/user/project/merge_requests/cherry_pick_changes.md
0 → 100644
View file @
14a96a1a
# 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"
doc/
workflow
/img/cherry_pick_changes_commit.png
→
doc/
user/project/merge_requests
/img/cherry_pick_changes_commit.png
View file @
14a96a1a
File moved
doc/
workflow
/img/cherry_pick_changes_commit_modal.png
→
doc/
user/project/merge_requests
/img/cherry_pick_changes_commit_modal.png
View file @
14a96a1a
File moved
doc/
workflow
/img/cherry_pick_changes_mr.png
→
doc/
user/project/merge_requests
/img/cherry_pick_changes_mr.png
View file @
14a96a1a
File moved
doc/
workflow
/img/cherry_pick_changes_mr_modal.png
→
doc/
user/project/merge_requests
/img/cherry_pick_changes_mr_modal.png
View file @
14a96a1a
File moved
doc/workflow/cherry_pick_changes.md
View file @
14a96a1a
# Cherry-pick changes
This document was moved to
[
user/project/merge_requests/cherry_pick_changes
](
../user/project/merge_requests/cherry_pick_changes.md
)
.
> [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"
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment