diff options
| author | Junio C Hamano <gitster@pobox.com> | 2011-08-11 11:03:13 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2011-08-11 11:03:13 -0700 |
| commit | 0e9b12f874955cba820efd786e176be8ba1acc2e (patch) | |
| tree | 6946d3ebc4adc74c8a26099ff00a9369636f6290 /Makefile | |
| parent | 5fb249aec763205f8d26370a18c5adb167008dd8 (diff) | |
| parent | d24d905509207fb47abe654789e1248a18785dfc (diff) | |
| download | git-0e9b12f874955cba820efd786e176be8ba1acc2e.tar.gz | |
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
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 6 |
1 files changed, 3 insertions, 3 deletions
@@ -30,15 +30,15 @@ all:: # 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. # # Define NO_EXPAT if you do not have expat installed. git-http-push is -# not built, and you cannot push using http:// and https:// transports. +# not built, and you cannot push using http:// and https:// transports (dumb). # # Define EXPATDIR=/foo/bar if your expat header and library files are in # /foo/bar/include and /foo/bar/lib directories. |