diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-03-16 21:18:33 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-03-16 21:18:33 +0300 |
commit | f64a639bcfa1fc2bc89ca7db268f594306edfd7c (patch) | |
tree | a2c3c2ebcc3b45e596949db485d6ed18ffaacfa1 /doc/university/training | |
parent | bfbc3e0d6583ea1a91f627528bedc3d65ba4b10f (diff) |
Add latest changes from gitlab-org/gitlab@13-10-stable-eev13.10.0-rc40
Diffstat (limited to 'doc/university/training')
-rw-r--r-- | doc/university/training/gitlab_flow/feature_branches.png | bin | 6202 -> 0 bytes | |||
-rw-r--r-- | doc/university/training/index.md | 1 | ||||
-rw-r--r-- | doc/university/training/topics/cherry_picking.md | 36 | ||||
-rw-r--r-- | doc/university/training/topics/tags.md | 52 |
4 files changed, 8 insertions, 81 deletions
diff --git a/doc/university/training/gitlab_flow/feature_branches.png b/doc/university/training/gitlab_flow/feature_branches.png Binary files differdeleted file mode 100644 index 612e0248222..00000000000 --- a/doc/university/training/gitlab_flow/feature_branches.png +++ /dev/null diff --git a/doc/university/training/index.md b/doc/university/training/index.md index 13cf4184560..f69bd51b341 100644 --- a/doc/university/training/index.md +++ b/doc/university/training/index.md @@ -34,7 +34,6 @@ This section contains the following topics: - [Merge conflicts](topics/merge_conflicts.md). - [Rollback commits](topics/rollback_commits.md). - [Subtree](topics/subtree.md). -- [Tags](topics/tags.md). - [Unstage](topics/unstage.md). ## Additional Resources 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 ca438e04a55..28fd8400d99 100644 --- a/doc/university/training/topics/tags.md +++ b/doc/university/training/topics/tags.md @@ -1,52 +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 -type: reference +redirect_to: '../../../topics/git/tags.md' --- -# Tags +This document was moved to [another location](../../../topics/git/tags.md). -- Useful for marking deployments and releases -- Annotated tags are an unchangeable part of Git history -- Soft/lightweight tags can be set and removed at will -- Many projects combine an annotated release tag with a stable branch -- Consider setting deployment/release tags automatically - -## Tags sample workflow - -- Create a lightweight tag -- Create an annotated tag -- Push the tags to the remote repository - -```shell -git checkout master - -# Lightweight tag -git tag my_lightweight_tag - -# Annotated tag -git tag -a v1.0 -m ‘Version 1.0’ - -# Show list of the existing tags -git tag - -git push origin --tags -``` - -**Additional resources** - -<https://git-scm.com/book/en/Git-Basics-Tagging> - -<!-- ## Troubleshooting - -Include any troubleshooting steps that you can foresee. If you know beforehand what issues -one might have when setting this up, or when something is changed, or on upgrading, it's -important to describe those, too. Think of things that may go wrong and include them here. -This is important to minimize requests for support, and to avoid doc comments with -questions that you know someone might ask. - -Each scenario can be a third-level heading, e.g. `### Getting error message X`. -If you have none to add when creating a doc, leave this section in place -but commented out to help encourage others to add to it in the future. --> +<!-- 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 --> |