summaryrefslogtreecommitdiff
path: root/builtin/replace.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2018-08-15 22:08:23 (GMT)
committerJunio C Hamano <gitster@pobox.com>2018-08-15 22:08:23 (GMT)
commit3ec5ebee155d69eaa096c57e46be2f20300ddc01 (patch)
tree1fa3326fa0bab910b815e9eaac114c1c2b62796b /builtin/replace.c
parent2d7a20258f791485d0fa0094e930eee094a77076 (diff)
parent53fc999306af60213e18b3ffd4c0347e4a88af0a (diff)
downloadgit-3ec5ebee155d69eaa096c57e46be2f20300ddc01.zip
git-3ec5ebee155d69eaa096c57e46be2f20300ddc01.tar.gz
git-3ec5ebee155d69eaa096c57e46be2f20300ddc01.tar.bz2
Merge branch 'hs/gpgsm'
Teach "git tag -s" etc. a few configuration variables (gpg.format that can be set to "openpgp" or "x509", and gpg.<format>.program that is used to specify what program to use to deal with the format) to allow x.509 certs with CMS via "gpgsm" to be used instead of openpgp via "gnupg". * hs/gpgsm: gpg-interface t: extend the existing GPG tests with GPGSM gpg-interface: introduce new signature format "x509" using gpgsm gpg-interface: introduce new config to select per gpg format program gpg-interface: do not hardcode the key string len anymore gpg-interface: introduce an abstraction for multiple gpg formats t/t7510: check the validation of the new config gpg.format gpg-interface: add new config to select how to sign a commit
Diffstat (limited to 'builtin/replace.c')
0 files changed, 0 insertions, 0 deletions