diff options
Diffstat (limited to 'doc/topics/git')
| -rw-r--r-- | doc/topics/git/feature_branch_development.md | 6 | ||||
| -rw-r--r-- | doc/topics/git/feature_branching.md | 2 | ||||
| -rw-r--r-- | doc/topics/git/git_rebase.md | 2 | ||||
| -rw-r--r-- | doc/topics/git/lfs/index.md | 14 | ||||
| -rw-r--r-- | doc/topics/git/lfs/migrate_to_git_lfs.md | 4 | ||||
| -rw-r--r-- | doc/topics/git/partial_clone.md | 2 |
6 files changed, 11 insertions, 19 deletions
diff --git a/doc/topics/git/feature_branch_development.md b/doc/topics/git/feature_branch_development.md index ae1485741a5..b205cedbdaa 100644 --- a/doc/topics/git/feature_branch_development.md +++ b/doc/topics/git/feature_branch_development.md @@ -75,7 +75,7 @@ In this case, the feature branch would be `release-X-Y`. Assuming the `release-X  -1. After you click **Create merge request**, an option to **Change branches** displays. Select that option. +1. After you select **Create merge request**, an option to **Change branches** displays. Select that option. 1. In the **New Merge Request** screen, you can now select the **Source** and **Target** branches. In the screenshot shown, @@ -83,7 +83,7 @@ we have selected `test-branch` as the source, and `release-13-0` as the target.  -1. Once you've selected the Source and Target branches, click **Compare branches and continue**. +1. Once you've selected the Source and Target branches, select **Compare branches and continue**. You should see an entry similar to: ```plaintext @@ -94,7 +94,7 @@ we have selected `test-branch` as the source, and `release-13-0` as the target. An entry like this confirms your merge request's destination. -1. Make any additional changes in the **New Merge Request** screen, and click **Submit merge request**. +1. Make any additional changes in the **New Merge Request** screen, and select **Submit merge request**. 1. In the new merge request, look for **Request to merge**. An entry similar to this displays: ```plaintext diff --git a/doc/topics/git/feature_branching.md b/doc/topics/git/feature_branching.md index d3b2510f4e8..4e9b43d66f8 100644 --- a/doc/topics/git/feature_branching.md +++ b/doc/topics/git/feature_branching.md @@ -16,7 +16,7 @@ comments: false ## Feature branching sample workflow -1. Create a new feature branch called 'squash_some_bugs' +1. Create a new feature branch called `squash_some_bugs` 1. Edit '`bugs.rb`' and remove all the bugs. 1. Commit 1. Push diff --git a/doc/topics/git/git_rebase.md b/doc/topics/git/git_rebase.md index 87fce0b29ff..1e118f98ca5 100644 --- a/doc/topics/git/git_rebase.md +++ b/doc/topics/git/git_rebase.md @@ -180,7 +180,7 @@ the operation you want to perform in each commit. To do so, edit the commits in your terminal's text editor. For example, with [Vim](https://www.vim.org/) as the text editor in -a macOS's `ZSH` shell, you can `squash` or `fixup` (combine) all three commits: +a macOS's Zsh shell, you can `squash` or `fixup` (combine) all three commits: <!-- vale gitlab.FirstPerson = NO --> diff --git a/doc/topics/git/lfs/index.md b/doc/topics/git/lfs/index.md index 410d2150de5..d40690d86c6 100644 --- a/doc/topics/git/lfs/index.md +++ b/doc/topics/git/lfs/index.md @@ -29,7 +29,7 @@ Documentation for GitLab instance administrators is under [LFS administration do ## Requirements -- Git LFS must be [enabled in project settings](../../../user/project/settings/index.md#sharing-and-permissions). +- Git LFS must be [enabled in project settings](../../../user/project/settings/index.md#configure-project-visibility-features-and-permissions). - [Git LFS client](https://git-lfs.github.com) version 1.0.1 or higher must be installed. ## Known limitations @@ -198,11 +198,7 @@ If the status `error 501` is shown, it is because: remove the line and try to update your Git LFS client. Only version 1.0.1 and newer are supported. -<!-- vale gitlab.Spelling = NO --> - -### getsockopt: connection refused - -<!-- vale gitlab.Spelling = YES --> +### `getsockopt: connection refused` If you push an LFS object to a project and receive an error like this, the LFS client is trying to reach GitLab through HTTPS. However, your GitLab @@ -262,11 +258,7 @@ If you are storing LFS files outside of GitLab you can disable LFS on the projec It is possible to host LFS objects externally by setting a custom LFS URL with `git config -f .lfsconfig lfs.url https://example.com/<project>.git/info/lfs`. -<!-- vale gitlab.Spelling = NO --> - -You might choose to do this if you are using an appliance like a Sonatype Nexus to store LFS data. If you choose to use an external LFS store, +You might choose to do this if you are using an appliance like a Nexus Repository to store LFS data. If you choose to use an external LFS store, GitLab can't verify LFS objects. Pushes then fail if you have GitLab LFS support enabled. -<!-- vale gitlab.Spelling = YES --> - To stop push failure, LFS support can be disabled in the [Project settings](../../../user/project/settings/index.md), which also disables GitLab LFS value-adds (Verifying LFS objects, UI integration for LFS). diff --git a/doc/topics/git/lfs/migrate_to_git_lfs.md b/doc/topics/git/lfs/migrate_to_git_lfs.md index 32e3b6e2f72..864615e7264 100644 --- a/doc/topics/git/lfs/migrate_to_git_lfs.md +++ b/doc/topics/git/lfs/migrate_to_git_lfs.md @@ -121,7 +121,7 @@ Consider an example upstream project, `git@gitlab.com:gitlab-tests/test-git-lfs- 1. Navigate to your project's **Settings > Repository** and expand **Protected branches**. - 1. Scroll down to locate the protected branches and click + 1. Scroll down to locate the protected branches and select **Unprotect** the default branch. 1. Force-push to GitLab: @@ -162,7 +162,7 @@ Consider an example upstream project, `git@gitlab.com:gitlab-tests/test-git-lfs- 1. Select the default branch from the **Branch** dropdown menu, and set up the **Allowed to push** and **Allowed to merge** rules. - 1. Click **Protect**. + 1. Select **Protect**. <!-- ## Troubleshooting diff --git a/doc/topics/git/partial_clone.md b/doc/topics/git/partial_clone.md index 91ff4d69c2f..eeae0d78638 100644 --- a/doc/topics/git/partial_clone.md +++ b/doc/topics/git/partial_clone.md @@ -160,7 +160,7 @@ For more details, see the Git documentation for ``` WARNING: - Git integrations with `bash`, `zsh`, etc and editors that automatically + Git integrations with `bash`, Zsh, etc and editors that automatically show Git status information often run `git fetch` which fetches the entire repository. Disabling or reconfiguring these integrations might be required. |