diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-03-03 03:10:50 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-03-03 03:10:50 +0300 |
| commit | 8d9c82762d6c4f10f4d3eba5d484179f98c284b0 (patch) | |
| tree | 4e89532d0d82bfaa1af660a76091528eb4aebc86 /doc/university | |
| parent | eb1755b2d90efcc161774f66ccd2317ad4c471de (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'doc/university')
| -rw-r--r-- | doc/university/training/topics/cherry_picking.md | 36 | ||||
| -rw-r--r-- | doc/university/training/topics/tags.md | 2 |
2 files changed, 5 insertions, 33 deletions
diff --git a/doc/university/training/topics/cherry_picking.md b/doc/university/training/topics/cherry_picking.md index 2f806ad2590..f0f815baa94 100644 --- a/doc/university/training/topics/cherry_picking.md +++ b/doc/university/training/topics/cherry_picking.md @@ -1,36 +1,8 @@ --- -stage: none -group: unassigned -info: To determine the technical writer assigned to the Stage/Group associated with this page, see https://about.gitlab.com/handbook/engineering/ux/technical-writing/#assignments -comments: false +redirect_to: '../../../topics/git/cherry_picking.md' --- -# Cherry Pick +This document was moved to [another location](../../../topics/git/cherry_picking.md). -- Given an existing commit on one branch, apply the change to another branch -- Useful for backporting bug fixes to previous release branches -- Make the commit on the master branch and pick in to stable - -## Cherry Pick sample workflow - -1. Check out a new 'stable' branch from 'master' -1. Change back to 'master' -1. Edit '`cherry_pick.rb`' and commit the changes. -1. Check commit log to get the commit SHA -1. Check out the 'stable' branch -1. Cherry pick the commit using the SHA obtained earlier - -```shell -git checkout master -git checkout -b stable -git checkout master - -# Edit `cherry_pick.rb` -git add cherry_pick.rb -git commit -m 'Fix bugs in cherry_pick.rb' -git log -# Copy commit SHA -git checkout stable - -git cherry-pick <commit SHA> -``` +<!-- This redirect file can be deleted after <2021-06-01>. --> +<!-- Before deletion, see: https://docs.gitlab.com/ee/development/documentation/#move-or-rename-a-page --> diff --git a/doc/university/training/topics/tags.md b/doc/university/training/topics/tags.md index bb2e3e9b208..28fd8400d99 100644 --- a/doc/university/training/topics/tags.md +++ b/doc/university/training/topics/tags.md @@ -4,5 +4,5 @@ redirect_to: '../../../topics/git/tags.md' This document was moved to [another location](../../../topics/git/tags.md). -<!-- This redirect file can be deleted after <YYYY-MM-DD>. --> +<!-- This redirect file can be deleted after <2021-06-01>. --> <!-- Before deletion, see: https://docs.gitlab.com/ee/development/documentation/#move-or-rename-a-page --> |