summaryrefslogtreecommitdiff
path: root/doc/workflow
diff options
context:
space:
mode:
authorRobert Schilling <rschilling@student.tugraz.at>2015-11-25 09:05:31 +0000
committerRobert Schilling <rschilling@student.tugraz.at>2015-11-25 09:05:31 +0000
commit4cfc3df534c50957725f7e1f80c82f88fd764f70 (patch)
tree023acd4b96d507fc17b2e174403bc1a3a06b4615 /doc/workflow
parent3fd885fd91ced331a3dd0bdf0d8068969e6c3a78 (diff)
parentb9828278127724ff5eac60eb71e36f675b9985cd (diff)
downloadgitlab-ce-4cfc3df534c50957725f7e1f80c82f88fd764f70.tar.gz
Merge branch 'lfs-doc' into 'master'
Add reference to Microsoft's Git Credential Manager for Windows. Minor update to the LFS-documentation, referencing Microsoft's Git Credential Manager for Windows. See merge request !1892
Diffstat (limited to 'doc/workflow')
-rw-r--r--doc/workflow/lfs/manage_large_binaries_with_git_lfs.md4
1 files changed, 2 insertions, 2 deletions
diff --git a/doc/workflow/lfs/manage_large_binaries_with_git_lfs.md b/doc/workflow/lfs/manage_large_binaries_with_git_lfs.md
index 210a8f71c3b..b59e92cb317 100644
--- a/doc/workflow/lfs/manage_large_binaries_with_git_lfs.md
+++ b/doc/workflow/lfs/manage_large_binaries_with_git_lfs.md
@@ -121,6 +121,6 @@ git config --global credential.helper 'cache --timeout=3600'
This will remember the credentials for an hour after which Git operations will require re-authentication.
-If you are using OS X you can use `osxkeychain` to store and encrypt your credentials. For Windows, `wincred` is available.
+If you are using OS X you can use `osxkeychain` to store and encrypt your credentials. For Windows, you can use `wincred` or Microsoft's [Git Credential Manager for Windows](https://github.com/Microsoft/Git-Credential-Manager-for-Windows/releases).
-More details about various methods of storing the user credentials can be found on [Git Credential Storage documentation](https://git-scm.com/book/en/v2/Git-Tools-Credential-Storage).
+More details about various methods of storing the user credentials can be found on [Git Credential Storage documentation](https://git-scm.com/book/en/v2/Git-Tools-Credential-Storage). \ No newline at end of file