diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2021-10-12 10:35:19 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2021-10-12 10:35:19 -0700 |
| commit | e8191a52657ecfc12928cfe9eada80a883111ef2 (patch) | |
| tree | 31e4a1539d8a8fd19e7c65de777f6bf9b577dfdf /Documentation/config/user.txt | |
| parent | Twelfth batch (diff) | |
| parent | ssh signing: test that gpg fails for unknown keys (diff) | |
| download | tgif-e8191a52657ecfc12928cfe9eada80a883111ef2.tar.xz | |
Merge branch 'fs/ssh-signing' into fs/ssh-signing-fix
* fs/ssh-signing:
ssh signing: test that gpg fails for unknown keys
ssh signing: tests for logs, tags & push certs
ssh signing: duplicate t7510 tests for commits
ssh signing: verify signatures using ssh-keygen
ssh signing: provide a textual signing_key_id
ssh signing: retrieve a default key from ssh-agent
ssh signing: add ssh key format and signing code
ssh signing: add test prereqs
ssh signing: preliminary refactoring and clean-up
Diffstat (limited to 'Documentation/config/user.txt')
| -rw-r--r-- | Documentation/config/user.txt | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/Documentation/config/user.txt b/Documentation/config/user.txt index 59aec7c3ae..ad78dce9ec 100644 --- a/Documentation/config/user.txt +++ b/Documentation/config/user.txt @@ -36,3 +36,10 @@ user.signingKey:: commit, you can override the default selection with this variable. This option is passed unchanged to gpg's --local-user parameter, so you may specify a key using any method that gpg supports. + If gpg.format is set to "ssh" this can contain the literal ssh public + key (e.g.: "ssh-rsa XXXXXX identifier") or a file which contains it and + corresponds to the private key used for signing. The private key + needs to be available via ssh-agent. Alternatively it can be set to + a file containing a private key directly. If not set git will call + gpg.ssh.defaultKeyCommand (e.g.: "ssh-add -L") and try to use the first + key available. |