summaryrefslogtreecommitdiff
path: root/builtin/merge-tree.c
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2014-02-13 13:38:19 -0800
committerLibravatar Junio C Hamano <gitster@pobox.com>2014-02-13 13:38:19 -0800
commit7c9b668b83c68f14d7249170a0609554a7b4a0fe (patch)
treebcf72c01eb8754b5b582bd71f630bb028e3a252b /builtin/merge-tree.c
parentMerge branch 'sb/repack-in-c' into maint (diff)
parentsend-email: /etc/ssl/certs/ directory may not be usable as ca_path (diff)
downloadtgif-7c9b668b83c68f14d7249170a0609554a7b4a0fe.tar.xz
Merge branch 'rk/send-email-ssl-cert' into maint
A recent update to "git send-email" broke platforms where /etc/ssl/certs/ directory exists but cannot be used as SSL_ca_path (e.g. Fedora rawhide). * rk/send-email-ssl-cert: send-email: /etc/ssl/certs/ directory may not be usable as ca_path
Diffstat (limited to 'builtin/merge-tree.c')
0 files changed, 0 insertions, 0 deletions