Merge branch 'main' into repo-sync

Author: Octomerger

content/authentication/managing-commit-signature-verification/checking-for-existing-gpg-keys.md

@@ -27,7 +27,12 @@ shortTitle: Existing GPG keys
 {% data reusables.gpg.list-keys-with-note %}
 3. Check the command output to see if you have a GPG key pair.
     * If there are no GPG key pairs or you don't want to use any that are available for signing commits and tags, then [generate a new GPG key](/articles/generating-a-new-gpg-key).
-    * If there's an existing GPG key pair and you want to use it to sign commits and tags, then [add your GPG key to your GitHub account](/articles/adding-a-new-gpg-key-to-your-github-account).
+    * If there's an existing GPG key pair and you want to use it to sign commits and tags, you can display the public key using the following command, substituting in the GPG key ID you'd like to use. In this example, the GPG key ID is `3AA5C34371567BD2`:
+      ```shell
+      $ gpg --armor --export <em>3AA5C34371567BD2</em>
+      # Prints the GPG key ID, in ASCII armor format
+      ```
+      You can then [add your GPG key to your GitHub account](/articles/adding-a-new-gpg-key-to-your-github-account).
 
 ## Further reading
 

content/authentication/managing-commit-signature-verification/telling-git-about-your-signing-key.md

@@ -44,6 +44,12 @@ If you have multiple GPG keys, you need to tell Git which one to use.
   $ if [ -r ~/.bash_profile ]; then echo 'export GPG_TTY=$(tty)' >> ~/.bash_profile; \
     else echo 'export GPG_TTY=$(tty)' >> ~/.profile; fi
   ```
+1. Optionally, to prompt you to enter a PIN or passphrase when required, install `pinentry-mac`. For example, using [Homebrew](https://brew.sh/):
+  ```shell
+  $ brew install pinentry-mac
+  $ echo "pinentry-program $(which pinentry-mac)" >> ~/.gnupg/gpg-agent.conf
+  $ killall gpg-agent
+  ```
 
 {% data reusables.gpg.x-509-key %}