summaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorTay Ray Chuan <rctay89@gmail.com>2011-08-03 12:07:57 (GMT)
committerJunio C Hamano <gitster@pobox.com>2011-08-03 18:24:28 (GMT)
commitd24d905509207fb47abe654789e1248a18785dfc (patch)
tree93ade1b0be0a438e877cd49dcb944e4ac2a34264 /Makefile
parentec99c9a89a65749093e16aed37d393f646597b31 (diff)
downloadgit-d24d905509207fb47abe654789e1248a18785dfc.zip
git-d24d905509207fb47abe654789e1248a18785dfc.tar.gz
git-d24d905509207fb47abe654789e1248a18785dfc.tar.bz2
Makefile: some changes for http-related flag documentation
Rename git-http-pull to git-http-fetch. This was passed over in 215a7ad (Big tool rename, Wed Sep 7 17:26:23 2005 -0700). Also, distinguish between dumb and smart in flag docs, as the "warnings" in NO_CURL and NO_EXPACT are no longer accurate given the introduction of smart http(s). Signed-off-by: Tay Ray Chuan <rctay89@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile6
1 files changed, 3 insertions, 3 deletions
diff --git a/Makefile b/Makefile
index d2e2ea1..c07aa9a 100644
--- a/Makefile
+++ b/Makefile
@@ -24,15 +24,15 @@ all::
# Define NO_OPENSSL environment variable if you do not have OpenSSL.
# This also implies BLK_SHA1.
#
-# 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.