From: Junio C Hamano <gitster@pobox.com>
Date: Thu, 11 Aug 2011 18:03:13 +0000 (-0700)
Subject: Merge branch 'rc/maint-http-wrong-free'
X-Git-Tag: v1.7.7-rc0~38
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=0e9b12f874955cba820efd786e176be8ba1acc2e;p=git.git

Merge branch 'rc/maint-http-wrong-free'

* rc/maint-http-wrong-free:
  Makefile: some changes for http-related flag documentation
  http.c: fix an invalid free()

Conflicts:
	Makefile
---

0e9b12f874955cba820efd786e176be8ba1acc2e
diff --cc Makefile
index 62ad0c275,c07aa9a72..8dd782fd8
--- a/Makefile
+++ b/Makefile
@@@ -24,15 -24,9 +24,15 @@@ all:
  # Define NO_OPENSSL environment variable if you do not have OpenSSL.
  # This also implies BLK_SHA1.
  #
 +# Define USE_LIBPCRE if you have and want to use libpcre. git-grep will be
 +# able to use Perl-compatible regular expressions.
 +#
 +# Define LIBPCREDIR=/foo/bar if your libpcre header and library files are in
 +# /foo/bar/include and /foo/bar/lib directories.
 +#
- # Define NO_CURL if you do not have libcurl installed.  git-http-pull and
+ # Define NO_CURL if you do not have libcurl installed.  git-http-fetch and
  # git-http-push are not built, and you cannot use http:// and https://
- # transports.
+ # transports (neither smart nor dumb).
  #
  # Define CURLDIR=/foo/bar if your curl header and library files are in
  # /foo/bar/include and /foo/bar/lib directories.