diff options
| author | Junio C Hamano <gitster@pobox.com> | 2009-07-09 01:00:36 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2009-07-09 01:00:36 -0700 |
| commit | c535d767f7a518b79a0f9b9a70ec746de76da97c (patch) | |
| tree | 84f4889857e93a4a2bf526436ab0c9fd11855688 /dir.h | |
| parent | 128a9d86da3c156c7d1bf25692eeb68a522af935 (diff) | |
| parent | 754ae192a4390baeb4d00b96e72c69023efb22ee (diff) | |
| download | git-c535d767f7a518b79a0f9b9a70ec746de76da97c.tar.gz git-c535d767f7a518b79a0f9b9a70ec746de76da97c.tar.xz | |
Merge branch 'ml/http'
* ml/http:
http.c: add http.sslCertPasswordProtected option
http.c: prompt for SSL client certificate password
Conflicts:
http.c
Diffstat (limited to 'dir.h')
0 files changed, 0 insertions, 0 deletions