diff options
| author |  Henning Schild <henning.schild@siemens.com> | 2018-07-17 14:50:12 +0200 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2018-07-18 10:02:23 -0700 |
| commit | 1e7adb97566bff7d3431ce64b8d0d854a6863ed5 (patch) | |
| tree | 50d344fab57c89acb71ec573600156d30ca54e2c /Documentation | |
| parent | gpg-interface: introduce new config to select per gpg format program (diff) | |
| download | tgif-1e7adb97566bff7d3431ce64b8d0d854a6863ed5.tar.xz | |
gpg-interface: introduce new signature format "x509" using gpgsm
This commit allows git to create and check x509 type signatures using
gpgsm.
Signed-off-by: Henning Schild <henning.schild@siemens.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/config.txt | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/Documentation/config.txt b/Documentation/config.txt index 0e871346a7..ff1d4a76ca 100644 --- a/Documentation/config.txt +++ b/Documentation/config.txt @@ -1830,12 +1830,13 @@ gpg.program:: gpg.format:: Specifies which key format to use when signing with `--gpg-sign`. - Default is "openpgp", that is also the only supported value. + Default is "openpgp" and another possible value is "x509". gpg.<format>.program:: Use this to customize the program used for the signing format you chose. (see `gpg.program` and `gpg.format`) `gpg.program` can still - be used as a legacy synonym for `gpg.openpgp.program`. + be used as a legacy synonym for `gpg.openpgp.program`. The default + value for `gpg.x509.program` is "gpgsm". gui.commitMsgWidth:: Defines how wide the commit message window is in the |