diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-08-19 12:08:42 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-08-19 12:08:42 +0300 |
| commit | b76ae638462ab0f673e5915986070518dd3f9ad3 (patch) | |
| tree | bdab0533383b52873be0ec0eb4d3c66598ff8b91 /doc/gitlab-basics | |
| parent | 434373eabe7b4be9593d18a585fb763f1e5f1a6f (diff) | |
Add latest changes from gitlab-org/gitlab@14-2-stable-eev14.2.0-rc42
Diffstat (limited to 'doc/gitlab-basics')
| -rw-r--r-- | doc/gitlab-basics/create-your-ssh-keys.md | 9 | ||||
| -rw-r--r-- | doc/gitlab-basics/start-using-git.md | 6 |
2 files changed, 3 insertions, 12 deletions
diff --git a/doc/gitlab-basics/create-your-ssh-keys.md b/doc/gitlab-basics/create-your-ssh-keys.md deleted file mode 100644 index 673fb2911fa..00000000000 --- a/doc/gitlab-basics/create-your-ssh-keys.md +++ /dev/null @@ -1,9 +0,0 @@ ---- -redirect_to: '../ssh/index.md' -remove_date: '2021-07-04' ---- - -This document was moved to [another location](../ssh/index.md). - -<!-- This redirect file can be deleted after <2021-07-04>. --> -<!-- Before deletion, see: https://docs.gitlab.com/ee/development/documentation/#move-or-rename-a-page -->
\ No newline at end of file diff --git a/doc/gitlab-basics/start-using-git.md b/doc/gitlab-basics/start-using-git.md index 9b26e1f102c..dfd1f09e297 100644 --- a/doc/gitlab-basics/start-using-git.md +++ b/doc/gitlab-basics/start-using-git.md @@ -450,11 +450,11 @@ You can learn more about the different ways Git can undo changes in the ### Merge a branch with default branch When you are ready to add your changes to -the default branch, you `merge` the two together: +the default branch, you merge the feature branch into it: ```shell -git checkout <feature-branch> -git merge <default-branch> +git checkout <default-branch> +git merge <feature-branch> ``` In GitLab, you typically use a [merge request](../user/project/merge_requests/) to merge your changes, instead of using the command line. |