git.tremily.us Git - git.git/commit

author	Junio C Hamano <gitster@pobox.com>
	Thu, 9 Jul 2009 08:00:36 +0000 (01:00 -0700)
committer	Junio C Hamano <gitster@pobox.com>
	Thu, 9 Jul 2009 08:00:36 +0000 (01:00 -0700)
commit	c535d767f7a518b79a0f9b9a70ec746de76da97c
tree	84f4889857e93a4a2bf526436ab0c9fd11855688	tree \| snapshot
parent	128a9d86da3c156c7d1bf25692eeb68a522af935	commit \| diff
parent	754ae192a4390baeb4d00b96e72c69023efb22ee	commit \| diff

Merge branch 'ml/http'

* ml/http:
http.c: add http.sslCertPasswordProtected option
http.c: prompt for SSL client certificate password

Conflicts:
http.c

Documentation/config.txt	diff1 \|	diff2 \|	blob \| history
http.c	diff1 \|	diff2 \|	blob \| history

Git—the stupid content tracker

RSS Atom

Documentation/config.txt	diff1 \|	diff2 \|	blob \| history
http.c	diff1 \|	diff2 \|	blob \| history