aboutsummaryrefslogtreecommitdiff
path: root/merge-recursive.c
diff options
context:
space:
mode:
authorLars Kellogg-Stedman <lars@redhat.com>2015-05-08 09:22:15 -0400
committerJunio C Hamano <gitster@pobox.com>2015-05-08 10:56:26 -0700
commitf6f2a9e42d14e61429af418d8038aa67049b3821 (patch)
tree9c359d4e6c1721f112f201b9b0dd49670db61b93 /merge-recursive.c
parent16018ae5fb368151f3eff13730cf089b63f41962 (diff)
downloadgit-f6f2a9e42d14e61429af418d8038aa67049b3821.tar.gz
git-f6f2a9e42d14e61429af418d8038aa67049b3821.tar.xz
http: add support for specifying an SSL cipher list
Teach git about a new option, "http.sslCipherList", which permits one to specify a list of ciphers to use when negotiating SSL connections. The setting can be overwridden by the GIT_SSL_CIPHER_LIST environment variable. Signed-off-by: Lars Kellogg-Stedman <lars@redhat.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'merge-recursive.c')
0 files changed, 0 insertions, 0 deletions