diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2022-02-18 09:45:46 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2022-02-18 09:45:46 +0000 |
| commit | a7b3560714b4d9cc4ab32dffcd1f74a284b93580 (patch) | |
| tree | 7452bd5c3545c2fa67a28aa013835fb4fa071baf /doc/topics/git | |
| parent | ee9173579ae56a3dbfe5afe9f9410c65bb327ca7 (diff) | |
| download | gitlab-ce-a7b3560714b4d9cc4ab32dffcd1f74a284b93580.tar.gz | |
Add latest changes from gitlab-org/gitlab@14-8-stable-eev14.8.0-rc42
Diffstat (limited to 'doc/topics/git')
| -rw-r--r-- | doc/topics/git/lfs/index.md | 2 | ||||
| -rw-r--r-- | doc/topics/git/lfs/migrate_to_git_lfs.md | 2 | ||||
| -rw-r--r-- | doc/topics/git/merge_conflicts.md | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/doc/topics/git/lfs/index.md b/doc/topics/git/lfs/index.md index a94caf2bf33..977f51a7211 100644 --- a/doc/topics/git/lfs/index.md +++ b/doc/topics/git/lfs/index.md @@ -31,7 +31,7 @@ Documentation for GitLab instance administrators is under [LFS administration do - Git LFS is supported in GitLab starting with version 8.2 - Git LFS must be enabled under project settings -- [Git LFS client](https://git-lfs.github.com) version 1.0.1 and up +- [Git LFS client](https://git-lfs.github.com) version 1.0.1 and up must be installed ## Known limitations diff --git a/doc/topics/git/lfs/migrate_to_git_lfs.md b/doc/topics/git/lfs/migrate_to_git_lfs.md index 2786368a9d7..32e3b6e2f72 100644 --- a/doc/topics/git/lfs/migrate_to_git_lfs.md +++ b/doc/topics/git/lfs/migrate_to_git_lfs.md @@ -46,7 +46,7 @@ Before beginning, make sure: To follow this tutorial, you need: -- The [Maintainer role](../../../user/permissions.md) for the existing Git repository +- The Maintainer role for the existing Git repository you'd like to migrate to LFS with access through the command line. - [Git](https://git-scm.com/book/en/v2/Getting-Started-Installing-Git) and [Java Runtime Environment](https://www.java.com/en/download/manual.jsp) diff --git a/doc/topics/git/merge_conflicts.md b/doc/topics/git/merge_conflicts.md index bf69190030c..47276ccb0b2 100644 --- a/doc/topics/git/merge_conflicts.md +++ b/doc/topics/git/merge_conflicts.md @@ -23,7 +23,7 @@ comments: false 1. Fix conflicts on the `conflicts.rb` file. 1. Stage the file and continue rebasing. 1. Force push the changes. -1. Finally continue with the Merge Request. +1. Finally continue with the merge request. ```shell git checkout -b conflicts_branch |