diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2015-03-05 13:13:03 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2015-03-05 13:13:04 -0800 |
| commit | ab09f58e8ce57e44faf810ed049f8a8934989503 (patch) | |
| tree | c60584f782779bcc8a972be04d521eb727152ed2 /merge-recursive.c | |
| parent | Merge branch 'jc/remote-set-url-doc' into maint (diff) | |
| parent | t/lib-gpg: sanity-check that we can actually sign (diff) | |
| download | tgif-ab09f58e8ce57e44faf810ed049f8a8934989503.tar.xz | |
Merge branch 'ch/new-gpg-drops-rfc-1991' into maint
Older GnuPG implementations may not correctly import the keyring
material we prepare for the tests to use.
* ch/new-gpg-drops-rfc-1991:
t/lib-gpg: sanity-check that we can actually sign
t/lib-gpg: include separate public keys in keyring.gpg
Diffstat (limited to 'merge-recursive.c')
0 files changed, 0 insertions, 0 deletions