diff options
author | Nguyễn Thái Ngọc Duy <pclouds@gmail.com> | 2018-10-27 06:23:03 (GMT) |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2018-10-29 01:17:02 (GMT) |
commit | ea555d048a136f25f93bd91584d23a51adea1c3c (patch) | |
tree | 651df3585ee161eb4d45032b6d0b11617786cdf7 /Documentation/config.txt | |
parent | 434e6e753febfda1d8331d07890f2e3fae5931e3 (diff) | |
download | git-ea555d048a136f25f93bd91584d23a51adea1c3c.zip git-ea555d048a136f25f93bd91584d23a51adea1c3c.tar.gz git-ea555d048a136f25f93bd91584d23a51adea1c3c.tar.bz2 |
config.txt: move gpg.* to a separate file
Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation/config.txt')
-rw-r--r-- | Documentation/config.txt | 21 |
1 files changed, 1 insertions, 20 deletions
diff --git a/Documentation/config.txt b/Documentation/config.txt index 177fefc..f52b898 100644 --- a/Documentation/config.txt +++ b/Documentation/config.txt @@ -341,26 +341,7 @@ include::config/gitweb.txt[] include::config/grep.txt[] -gpg.program:: - Use this custom program instead of "`gpg`" found on `$PATH` when - making or verifying a PGP signature. The program must support the - same command-line interface as GPG, namely, to verify a detached - signature, "`gpg --verify $file - <$signature`" is run, and the - program is expected to signal a good signature by exiting with - code 0, and to generate an ASCII-armored detached signature, the - standard input of "`gpg -bsau $key`" is fed with the contents to be - signed, and the program is expected to send the result to its - standard output. - -gpg.format:: - Specifies which key format to use when signing with `--gpg-sign`. - 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`. The default - value for `gpg.x509.program` is "gpgsm". +include::config/gpg.txt[] include::gui-config.txt[] |