Commit cde7df97 authored by Achilleas Pipinellis's avatar Achilleas Pipinellis

LFS SSH support was added in GitLab 8.12

[ci skip]
parent fc42f603
...@@ -197,7 +197,7 @@ can cause `git-annex` to raise unpredicted warnings and errors. ...@@ -197,7 +197,7 @@ can cause `git-annex` to raise unpredicted warnings and errors.
Consult the [Annex upgrade page][annex-upgrade] for more information about Consult the [Annex upgrade page][annex-upgrade] for more information about
the differences between versions. You can find out which version is installed the differences between versions. You can find out which version is installed
on your server by navigating to <https://pkgs.org/download/git-annex> and on your server by navigating to <https://pkgs.org/download/git-annex> and
seaching for your distribution. searching for your distribution.
Although there is no general guide for `git-annex` errors, there are a few tips Although there is no general guide for `git-annex` errors, there are a few tips
on how to go around the warnings. on how to go around the warnings.
...@@ -234,7 +234,7 @@ push origin ...@@ -234,7 +234,7 @@ push origin
[deprecate-annex-issue]: https://gitlab.com/gitlab-org/gitlab-ee/issues/1648 [deprecate-annex-issue]: https://gitlab.com/gitlab-org/gitlab-ee/issues/1648
[git-annex]: https://git-annex.branchable.com/ "git-annex website" [git-annex]: https://git-annex.branchable.com/ "git-annex website"
[gitlab shell]: https://gitlab.com/gitlab-org/gitlab-shell "GitLab Shell repository" [gitlab shell]: https://gitlab.com/gitlab-org/gitlab-shell "GitLab Shell repository"
[guide]: lfs/migrate_from_git-annex_to_git-lfs.html [guide]: lfs/migrate_from_git_annex_to_git_lfs.html
[issue]: https://git-annex.branchable.com/forum/Error_from_git-annex-shell_on_creation_of_gcrypt_special_remote/ "git-annex issue" [issue]: https://git-annex.branchable.com/forum/Error_from_git-annex-shell_on_creation_of_gcrypt_special_remote/ "git-annex issue"
[reconfigure GitLab]: ../administration/restart_gitlab.md#omnibus-gitlab-reconfigure [reconfigure GitLab]: ../administration/restart_gitlab.md#omnibus-gitlab-reconfigure
[restart GitLab]: ../administration/restart_gitlab.md#installations-from-source [restart GitLab]: ../administration/restart_gitlab.md#installations-from-source
...@@ -15,7 +15,8 @@ Enterprise editions. ...@@ -15,7 +15,8 @@ Enterprise editions.
## Differences between Git Annex and Git LFS ## Differences between Git Annex and Git LFS
- Git Annex works only through SSH, whereas Git LFS only through HTTPS. - Git Annex works only through SSH, whereas Git LFS works both with SSH and HTTPS
(SSH support was added in GitLab 8.12).
- Annex files are stored in a sub-directory of the normal repositories, whereas - Annex files are stored in a sub-directory of the normal repositories, whereas
LFS files are stored outside of the repositories in a place you can define. LFS files are stored outside of the repositories in a place you can define.
- Git Annex requires a more complex setup, but has much more options than Git - Git Annex requires a more complex setup, but has much more options than Git
...@@ -178,11 +179,10 @@ GitLab.com), therefore, you don't need to do anything server-side. ...@@ -178,11 +179,10 @@ GitLab.com), therefore, you don't need to do anything server-side.
git push git push
``` ```
Once asked, enter your login credentials since LFS communicates only with If your remote is set up with HTTP, you will be asked to enter your login
HTTPS. If you have [2FA enabled][2fa], make sure to use a credentials. If you have [2FA enabled][2fa], make sure to use a
[personal access token][token] instead of your password. [personal access token][token] instead of your password.
## Removing the Git Annex branches ## Removing the Git Annex branches
After the migration finishes successfully, you can remove all `git-annex` After the migration finishes successfully, you can remove all `git-annex`
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment