diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2022-09-14 21:12:48 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2022-09-14 21:12:48 +0300 |
| commit | 35f525b5e4c2246f2411f627d4c119c5b2c5ae81 (patch) | |
| tree | faa8eb9ded77bae862b881e9128a919e74ad1c5e /doc/user/project/merge_requests/cherry_pick_changes.md | |
| parent | c014b6b4e5c33180dd5cbff1dd1bb4623d1eca80 (diff) | |
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 | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/doc/user/project/merge_requests/cherry_pick_changes.md b/doc/user/project/merge_requests/cherry_pick_changes.md index 7d12fdac87a..2040995280e 100644 --- a/doc/user/project/merge_requests/cherry_pick_changes.md +++ b/doc/user/project/merge_requests/cherry_pick_changes.md @@ -23,6 +23,7 @@ is tracked [in this issue](https://gitlab.com/gitlab-org/gitlab/-/issues/202215) ## Cherry-pick example In this example of cherry-picking, a Git repository has two branches: `develop` and `main`. +This example shows a cherry-picked commit from one branch being added to another: ```mermaid gitGraph @@ -41,7 +42,7 @@ gitGraph commit id:"H" ``` -The example shows a cherry-pick of commit `B` from the `develop` branch, which is added +In this example, a cherry-pick of commit `B` from the `develop` branch is added after commit `E` in the `main` branch. Commit `G` is added after the cherry-pick. |