summaryrefslogtreecommitdiff
path: root/doc/user/project/import/index.md
diff options
context:
space:
mode:
authorAchilleas Pipinellis <axil@gitlab.com>2017-09-06 14:56:13 +0000
committerAchilleas Pipinellis <axil@gitlab.com>2017-09-06 14:56:13 +0000
commit5e6b5832ea9e0e78314b69aee764410edaa0fafd (patch)
tree42b0fa6d7ed1de149ce231585369cb80bbb8de86 /doc/user/project/import/index.md
parent794e37661d8cf847cda750a8e62a809889534125 (diff)
parentcdd8f2f345aeb3fb05bbe8f567e72b717f388636 (diff)
downloadgitlab-ce-5e6b5832ea9e0e78314b69aee764410edaa0fafd.tar.gz
Merge branch 'master' into 'docs/migrating-from-tfs'
# Conflicts: # doc/user/project/import/index.md
Diffstat (limited to 'doc/user/project/import/index.md')
-rw-r--r--doc/user/project/import/index.md1
1 files changed, 1 insertions, 0 deletions
diff --git a/doc/user/project/import/index.md b/doc/user/project/import/index.md
index 0f53ccc447b..0a6c8546e61 100644
--- a/doc/user/project/import/index.md
+++ b/doc/user/project/import/index.md
@@ -9,6 +9,7 @@
1. [From ClearCase](clearcase.md)
1. [From Perforce](perforce.md)
1. [From TFS](tfs.md)
+1. [From CVS](cvs.md)
In addition to the specific migration documentation above, you can import any
Git repository via HTTP from the New Project page. Be aware that if the