Consistency: Use "libcurl" instead of "cURL library" and "curl"
Signed-off-by: Johan Herland <johan@herland.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
parent
b96317f38f
commit
8da1e21231
@ -15,8 +15,8 @@ DESCRIPTION
|
|||||||
Sends missing objects to remote repository, and updates the
|
Sends missing objects to remote repository, and updates the
|
||||||
remote branch.
|
remote branch.
|
||||||
|
|
||||||
*NOTE*: This command is temporarily disabled if your cURL
|
*NOTE*: This command is temporarily disabled if your libcurl
|
||||||
library is older than 7.16, as the combination has been reported
|
is older than 7.16, as the combination has been reported
|
||||||
not to work and sometimes corrupts repository.
|
not to work and sometimes corrupts repository.
|
||||||
|
|
||||||
OPTIONS
|
OPTIONS
|
||||||
|
@ -186,7 +186,7 @@ Step 3: setup the client
|
|||||||
------------------------
|
------------------------
|
||||||
|
|
||||||
Make sure that you have HTTP support, i.e. your git was built with
|
Make sure that you have HTTP support, i.e. your git was built with
|
||||||
curl (version more recent than 7.10). The command 'git http-push' with
|
libcurl (version more recent than 7.10). The command 'git http-push' with
|
||||||
no argument should display a usage message.
|
no argument should display a usage message.
|
||||||
|
|
||||||
Then, add the following to your $HOME/.netrc (you can do without, but will be
|
Then, add the following to your $HOME/.netrc (you can do without, but will be
|
||||||
|
2
Makefile
2
Makefile
@ -13,7 +13,7 @@ all::
|
|||||||
# Define NO_OPENSSL environment variable if you do not have OpenSSL.
|
# Define NO_OPENSSL environment variable if you do not have OpenSSL.
|
||||||
# This also implies MOZILLA_SHA1.
|
# This also implies MOZILLA_SHA1.
|
||||||
#
|
#
|
||||||
# Define NO_CURL if you do not have curl installed. git-http-pull and
|
# Define NO_CURL if you do not have libcurl installed. git-http-pull and
|
||||||
# git-http-push are not built, and you cannot use http:// and https://
|
# git-http-push are not built, and you cannot use http:// and https://
|
||||||
# transports.
|
# transports.
|
||||||
#
|
#
|
||||||
|
@ -158,7 +158,7 @@ AC_CHECK_LIB([crypto], [SHA1_Init],
|
|||||||
AC_SUBST(NEEDS_SSL_WITH_CRYPTO)
|
AC_SUBST(NEEDS_SSL_WITH_CRYPTO)
|
||||||
AC_SUBST(NO_OPENSSL)
|
AC_SUBST(NO_OPENSSL)
|
||||||
#
|
#
|
||||||
# Define NO_CURL if you do not have curl installed. git-http-pull and
|
# Define NO_CURL if you do not have libcurl installed. git-http-pull and
|
||||||
# git-http-push are not built, and you cannot use http:// and https://
|
# git-http-push are not built, and you cannot use http:// and https://
|
||||||
# transports.
|
# transports.
|
||||||
AC_CHECK_LIB([curl], [curl_global_init],
|
AC_CHECK_LIB([curl], [curl_global_init],
|
||||||
|
Loading…
Reference in New Issue
Block a user