diff options
| author | Johan Herland <johan@herland.net> | 2008-06-15 12:14:12 +0200 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2008-06-15 13:35:10 -0700 |
| commit | 8da1e21231a039889507f4d727882bd0a64e5b95 (patch) | |
| tree | 4f839f2416a22f2e5bde99422ef257b42304759e | |
| parent | b96317f38ffea4a869aa5e61e435cf61dc72349d (diff) | |
| download | git-8da1e21231a039889507f4d727882bd0a64e5b95.tar.gz git-8da1e21231a039889507f4d727882bd0a64e5b95.tar.xz | |
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>
| -rw-r--r-- | Documentation/git-http-push.txt | 4 | ||||
| -rw-r--r-- | Documentation/howto/setup-git-server-over-http.txt | 2 | ||||
| -rw-r--r-- | Makefile | 2 | ||||
| -rw-r--r-- | configure.ac | 2 |
4 files changed, 5 insertions, 5 deletions
diff --git a/Documentation/git-http-push.txt b/Documentation/git-http-push.txt index 8d32a9204..d69b20549 100644 --- a/Documentation/git-http-push.txt +++ b/Documentation/git-http-push.txt @@ -15,8 +15,8 @@ DESCRIPTION Sends missing objects to remote repository, and updates the remote branch. -*NOTE*: This command is temporarily disabled if your cURL -library is older than 7.16, as the combination has been reported +*NOTE*: This command is temporarily disabled if your libcurl +is older than 7.16, as the combination has been reported not to work and sometimes corrupts repository. OPTIONS diff --git a/Documentation/howto/setup-git-server-over-http.txt b/Documentation/howto/setup-git-server-over-http.txt index b7d09c1ec..403274860 100644 --- a/Documentation/howto/setup-git-server-over-http.txt +++ b/Documentation/howto/setup-git-server-over-http.txt @@ -186,7 +186,7 @@ Step 3: setup the client ------------------------ 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. Then, add the following to your $HOME/.netrc (you can do without, but will be @@ -13,7 +13,7 @@ all:: # Define NO_OPENSSL environment variable if you do not have OpenSSL. # 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:// # transports. # diff --git a/configure.ac b/configure.ac index 82584e915..7c2856efc 100644 --- a/configure.ac +++ b/configure.ac @@ -158,7 +158,7 @@ AC_CHECK_LIB([crypto], [SHA1_Init], AC_SUBST(NEEDS_SSL_WITH_CRYPTO) 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:// # transports. AC_CHECK_LIB([curl], [curl_global_init], |