From 52d52f2075e4dc7431cb4691b8dbe1948ab04bce Mon Sep 17 00:00:00 2001 From: poonam-lamba Date: Thu, 29 Oct 2020 11:25:09 -0500 Subject: [PATCH 1/3] Update generating-a-new-ssh-key-and-adding-it-to-the-ssh-agent.md I ran the steps today on mac OS Catalina and it did not work for me. I had to make two changes that I updated in the doc. --- ...erating-a-new-ssh-key-and-adding-it-to-the-ssh-agent.md | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/content/github/authenticating-to-github/generating-a-new-ssh-key-and-adding-it-to-the-ssh-agent.md b/content/github/authenticating-to-github/generating-a-new-ssh-key-and-adding-it-to-the-ssh-agent.md index 5997d0816d0a..e74f50ec02a7 100644 --- a/content/github/authenticating-to-github/generating-a-new-ssh-key-and-adding-it-to-the-ssh-agent.md +++ b/content/github/authenticating-to-github/generating-a-new-ssh-key-and-adding-it-to-the-ssh-agent.md @@ -88,14 +88,19 @@ Before adding a new SSH key to the ssh-agent to manage your keys, you should hav UseKeychain yes IdentityFile ~/.ssh/id_rsa ``` + {% note %} + **Note:** If you are not using the passphrase and if you get an error then try removing the UseKeychain line. + + {% endnote %} + 3. Add your SSH private key to the ssh-agent and store your passphrase in the keychain. {% data reusables.ssh.add-ssh-key-to-ssh-agent %} ```shell $ ssh-add -K ~/.ssh/id_rsa ``` {% note %} - **Note:** The `-K` option is Apple's standard version of `ssh-add`, which stores the passphrase in your keychain for you when you add an ssh key to the ssh-agent. + **Note:** The `-K` option is Apple's standard version of `ssh-add`, which stores the passphrase in your keychain for you when you add an ssh key to the ssh-agent.If you leave your passphrase blank, run the command without -K option. If you don't have Apple's standard version installed, you may receive an error. For more information on resolving this error, see "[Error: ssh-add: illegal option -- K](/articles/error-ssh-add-illegal-option-k)." From 671fea111099a7d7afc26125f974738f7b9a3229 Mon Sep 17 00:00:00 2001 From: poonam-lamba Date: Thu, 5 Nov 2020 09:19:54 -0600 Subject: [PATCH 2/3] Update content/github/authenticating-to-github/generating-a-new-ssh-key-and-adding-it-to-the-ssh-agent.md Co-authored-by: hubwriter --- ...erating-a-new-ssh-key-and-adding-it-to-the-ssh-agent.md | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/content/github/authenticating-to-github/generating-a-new-ssh-key-and-adding-it-to-the-ssh-agent.md b/content/github/authenticating-to-github/generating-a-new-ssh-key-and-adding-it-to-the-ssh-agent.md index e74f50ec02a7..6435c65c6e0e 100644 --- a/content/github/authenticating-to-github/generating-a-new-ssh-key-and-adding-it-to-the-ssh-agent.md +++ b/content/github/authenticating-to-github/generating-a-new-ssh-key-and-adding-it-to-the-ssh-agent.md @@ -88,11 +88,12 @@ Before adding a new SSH key to the ssh-agent to manage your keys, you should hav UseKeychain yes IdentityFile ~/.ssh/id_rsa ``` - {% note %} - **Note:** If you are not using the passphrase and if you get an error then try removing the UseKeychain line. + {% note %} + + **Note:** If you chose not to add a passphrase to your key, you should omit the `UseKeychain` line. - {% endnote %} + {% endnote %} 3. Add your SSH private key to the ssh-agent and store your passphrase in the keychain. {% data reusables.ssh.add-ssh-key-to-ssh-agent %} ```shell From 7566ecb23ca95cdf827896831a9ce7196e57d23e Mon Sep 17 00:00:00 2001 From: hubwriter Date: Fri, 6 Nov 2020 16:20:07 +0000 Subject: [PATCH 3/3] Update content/github/authenticating-to-github/generating-a-new-ssh-key-and-adding-it-to-the-ssh-agent.md Add space between sentences, plus slight rewording. --- .../generating-a-new-ssh-key-and-adding-it-to-the-ssh-agent.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/content/github/authenticating-to-github/generating-a-new-ssh-key-and-adding-it-to-the-ssh-agent.md b/content/github/authenticating-to-github/generating-a-new-ssh-key-and-adding-it-to-the-ssh-agent.md index 6435c65c6e0e..f435684a055e 100644 --- a/content/github/authenticating-to-github/generating-a-new-ssh-key-and-adding-it-to-the-ssh-agent.md +++ b/content/github/authenticating-to-github/generating-a-new-ssh-key-and-adding-it-to-the-ssh-agent.md @@ -101,7 +101,7 @@ Before adding a new SSH key to the ssh-agent to manage your keys, you should hav ``` {% note %} - **Note:** The `-K` option is Apple's standard version of `ssh-add`, which stores the passphrase in your keychain for you when you add an ssh key to the ssh-agent.If you leave your passphrase blank, run the command without -K option. + **Note:** The `-K` option is Apple's standard version of `ssh-add`, which stores the passphrase in your keychain for you when you add an ssh key to the ssh-agent. If you chose not to add a passphrase to your key, run the command without the `-K` option. If you don't have Apple's standard version installed, you may receive an error. For more information on resolving this error, see "[Error: ssh-add: illegal option -- K](/articles/error-ssh-add-illegal-option-k)."