Skip to content

Commit b5cc5b6

Browse files
committed
Merge branch 'fs/ssh-default-key-command-doc' into next
Doc update. * fs/ssh-default-key-command-doc: gpg docs: explain better use of ssh.defaultKeyCommand
2 parents 471f67a + ce18a30 commit b5cc5b6

File tree

1 file changed

+6
-3
lines changed

1 file changed

+6
-3
lines changed

Documentation/config/gpg.txt

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -36,9 +36,12 @@ gpg.minTrustLevel::
3636

3737
gpg.ssh.defaultKeyCommand::
3838
This command that will be run when user.signingkey is not set and a ssh
39-
signature is requested. On successful exit a valid ssh public key is
40-
expected in the first line of its output. To automatically use the first
41-
available key from your ssh-agent set this to "ssh-add -L".
39+
signature is requested. On successful exit a valid ssh public key
40+
prefixed with `key::` is expected in the first line of its output.
41+
This allows for a script doing a dynamic lookup of the correct public
42+
key when it is impractical to statically configure `user.signingKey`.
43+
For example when keys or SSH Certificates are rotated frequently or
44+
selection of the right key depends on external factors unknown to git.
4245

4346
gpg.ssh.allowedSignersFile::
4447
A file containing ssh public keys which you are willing to trust.

0 commit comments

Comments
 (0)