diff options
| author | Stan Hu <stanhu@gmail.com> | 2018-02-03 00:22:13 +0000 |
|---|---|---|
| committer | Stan Hu <stanhu@gmail.com> | 2018-02-03 00:22:13 +0000 |
| commit | 28f978efc1643e3a5d15d913d9b3cb6a5d388fef (patch) | |
| tree | 8ee685f95842c3d2ae4e5d2649501be6c97a54f4 | |
| parent | a3166376bb50d84540ba2c60f5f5131ee211ffa8 (diff) | |
| parent | a306c1957ecae2a5c5bf4812b7c31e7ac488e78a (diff) | |
| download | gitlab-ce-28f978efc1643e3a5d15d913d9b3cb6a5d388fef.tar.gz | |
Merge branch 'patch-1' into 'master'
Fix spelling of “discrepancy” in GitHub→GitLab project import docs
See merge request gitlab-org/gitlab-ce!16905
| -rw-r--r-- | doc/user/project/import/github.md | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/doc/user/project/import/github.md b/doc/user/project/import/github.md index 72def9d1d1d..8c639bd5343 100644 --- a/doc/user/project/import/github.md +++ b/doc/user/project/import/github.md @@ -46,7 +46,7 @@ namespace that started the import process. The importer will also import branches on forks of projects related to open pull requests. These branches will be imported with a naming scheme similar to -GH-SHA-Username/Pull-Request-number/fork-name/branch. This may lead to a discrepency +GH-SHA-Username/Pull-Request-number/fork-name/branch. This may lead to a discrepancy in branches compared to the GitHub Repository. For a more technical description and an overview of the architecture you can |