aboutsummaryrefslogtreecommitdiffstats
path: root/Documentation/config
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2023-03-06 21:51:56 -0800
committerJunio C Hamano <gitster@pobox.com>2023-03-06 21:51:56 -0800
commit9a4e18b7010f4f0136e71af3f701d10688b98a73 (patch)
tree14026bd9a02248b27602ae76af0a12a8724354dd /Documentation/config
parentd15644fe0226af7ffc874572d968598564a230dd (diff)
parent31a431b18b33cdfee7ddb61e63902bb1c3964bd5 (diff)
downloadgit-9a4e18b7010f4f0136e71af3f701d10688b98a73.tar.gz
Merge branch 'gm/signature-format-doc'
Doc update. * gm/signature-format-doc: signature-format.txt: note SSH and X.509 signature delimiters
Diffstat (limited to 'Documentation/config')
-rw-r--r--Documentation/config/gpg.txt3
1 files changed, 3 insertions, 0 deletions
diff --git a/Documentation/config/gpg.txt b/Documentation/config/gpg.txt
index 86f6308c4c..37e2831cd5 100644
--- a/Documentation/config/gpg.txt
+++ b/Documentation/config/gpg.txt
@@ -12,6 +12,9 @@ gpg.program::
gpg.format::
Specifies which key format to use when signing with `--gpg-sign`.
Default is "openpgp". Other possible values are "x509", "ssh".
++
+See linkgit:gitformat-signature[5] for the signature format, which differs
+based on the selected `gpg.format`.
gpg.<format>.program::
Use this to customize the program used for the signing format you