diff options
| author | Junio C Hamano <gitster@pobox.com> | 2020-01-30 22:17:08 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2020-01-30 22:17:08 (GMT) |
| commit | 11ad30b887e2512df1c7703913048827080601e1 (patch) | |
| tree | f9dcd7481c4ecd335d3f2c76a7637433d8d59d9e /Documentation | |
| parent | 96aef8f68404964c48d0d85ce04f6b2d84097246 (diff) | |
| parent | 54887b46890582e60fcb8ee1f287f62870c2ac0f (diff) | |
| download | git-11ad30b887e2512df1c7703913048827080601e1.zip git-11ad30b887e2512df1c7703913048827080601e1.tar.gz git-11ad30b887e2512df1c7703913048827080601e1.tar.bz2 | |
Merge branch 'hi/gpg-mintrustlevel'
gpg.minTrustLevel configuration variable has been introduced to
tell various signature verification codepaths the required minimum
trust level.
* hi/gpg-mintrustlevel:
gpg-interface: add minTrustLevel as a configuration option
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/config/gpg.txt | 15 | ||||
| -rw-r--r-- | Documentation/pretty-formats.txt | 1 |
2 files changed, 16 insertions, 0 deletions
diff --git a/Documentation/config/gpg.txt b/Documentation/config/gpg.txt index cce2c89..d94025c 100644 --- a/Documentation/config/gpg.txt +++ b/Documentation/config/gpg.txt @@ -18,3 +18,18 @@ gpg.<format>.program:: chose. (see `gpg.program` and `gpg.format`) `gpg.program` can still be used as a legacy synonym for `gpg.openpgp.program`. The default value for `gpg.x509.program` is "gpgsm". + +gpg.minTrustLevel:: + Specifies a minimum trust level for signature verification. If + this option is unset, then signature verification for merge + operations require a key with at least `marginal` trust. Other + operations that perform signature verification require a key + with at least `undefined` trust. Setting this option overrides + the required trust-level for all operations. Supported values, + in increasing order of significance: ++ +* `undefined` +* `never` +* `marginal` +* `fully` +* `ultimate` diff --git a/Documentation/pretty-formats.txt b/Documentation/pretty-formats.txt index 1a7212c..a4b6f49 100644 --- a/Documentation/pretty-formats.txt +++ b/Documentation/pretty-formats.txt @@ -226,6 +226,7 @@ endif::git-rev-list[] '%GF':: show the fingerprint of the key used to sign a signed commit '%GP':: show the fingerprint of the primary key whose subkey was used to sign a signed commit +'%GT':: show the trust level for the key used to sign a signed commit '%gD':: reflog selector, e.g., `refs/stash@{1}` or `refs/stash@{2 minutes ago}`; the format follows the rules described for the `-g` option. The portion before the `@` is the refname as |