]> git.ipfire.org Git - thirdparty/git.git/commitdiff
Merge branch 'mv/ssl-ftp-curl'
authorJunio C Hamano <gitster@pobox.com>
Fri, 19 Apr 2013 20:31:08 +0000 (13:31 -0700)
committerJunio C Hamano <gitster@pobox.com>
Fri, 19 Apr 2013 20:31:08 +0000 (13:31 -0700)
Does anybody really use commit walkers over (s)ftp?

* mv/ssl-ftp-curl:
  Support FTP-over-SSL/TLS for regular FTP

1  2 
Documentation/config.txt
http.c
http.h

Simple merge
diff --cc http.c
Simple merge
diff --cc http.h
Simple merge