summaryrefslogtreecommitdiff
path: root/doc
diff options
context:
space:
mode:
authorAchilleas Pipinellis <axilleas@axilleas.me>2016-02-06 18:35:01 +0000
committerAchilleas Pipinellis <axilleas@axilleas.me>2016-02-06 18:35:01 +0000
commitbce482a59a235edf1607dab73dff88aba4300012 (patch)
treeb42df29233c839072726ab44b1029fb353171541 /doc
parente63941ab34d7ee714d20d1f7e0b8bb57876153de (diff)
parentb92ce40daaf4093c91303194af918d6340d269c9 (diff)
downloadgitlab-ce-bce482a59a235edf1607dab73dff88aba4300012.tar.gz
Merge branch 'patch-1' into 'master'
fixed Windows commands in SSH Help. The current commands shown don't work in Command Line, or PowerShell. Command Line doesn't recognize the `~` character as the home directory, the `<` character is reserved in PowerShell, and `cat` doesn't work in Command Line. This commit provides commands that will work for both the Command Line, and PowerShell. See merge request !2694
Diffstat (limited to 'doc')
-rw-r--r--doc/ssh/README.md21
1 files changed, 19 insertions, 2 deletions
diff --git a/doc/ssh/README.md b/doc/ssh/README.md
index 77eb53427e2..a1198e5878f 100644
--- a/doc/ssh/README.md
+++ b/doc/ssh/README.md
@@ -5,6 +5,12 @@
An SSH key allows you to establish a secure connection between your
computer and GitLab. Before generating an SSH key in your shell, check if your system
already has one by running the following command:
+
+**Windows Command Line:**
+```bash
+type %userprofile%\.ssh\id_rsa.pub
+```
+**GNU/Linux/Mac/PowerShell:**
```bash
cat ~/.ssh/id_rsa.pub
```
@@ -25,6 +31,12 @@ press enter to use the default. If you use a different name, the key will not
be used automatically.
Use the command below to show your public key:
+
+**Windows Command Line:**
+```bash
+type %userprofile%\.ssh\id_rsa.pub
+```
+**GNU/Linux/Mac/PowerShell:**
```bash
cat ~/.ssh/id_rsa.pub
```
@@ -36,9 +48,14 @@ with your username and host.
To copy your public key to the clipboard, use the code below. Depending on your
OS you'll need to use a different command:
-**Windows:**
+**Windows Command Line:**
+```bash
+type %userprofile%\.ssh\id_rsa.pub | clip
+```
+
+**Windows PowerShell:**
```bash
-clip < ~/.ssh/id_rsa.pub
+cat ~/.ssh/id_rsa.pub | clip
```
**Mac:**