summaryrefslogtreecommitdiff
path: root/http.h
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2014-04-08 12:00:27 -0700
committerJunio C Hamano <gitster@pobox.com>2014-04-08 12:00:28 -0700
commitd59c12d7ad39f942fc60578ba1e934822f40445b (patch)
treef0591d6490164e7a8a672c79094a2d612899cfb7 /http.h
parent9b30a0339db28e6de9653b5631247d398cce626c (diff)
parent235e8d591480d7e1378c27fe65c5529625d4b5be (diff)
downloadgit-d59c12d7ad39f942fc60578ba1e934822f40445b.tar.gz
Merge branch 'jl/nor-or-nand-and'
Eradicate mistaken use of "nor" (that is, essentially "nor" used not in "neither A nor B" ;-)) from in-code comments, command output strings, and documentations. * jl/nor-or-nand-and: code and test: fix misuses of "nor" comments: fix misuses of "nor" contrib: fix misuses of "nor" Documentation: fix misuses of "nor"
Diffstat (limited to 'http.h')
-rw-r--r--http.h3
1 files changed, 1 insertions, 2 deletions
diff --git a/http.h b/http.h
index a82888445e..e64084fe6d 100644
--- a/http.h
+++ b/http.h
@@ -13,8 +13,7 @@
/*
* We detect based on the cURL version if multi-transfer is
* usable in this implementation and define this symbol accordingly.
- * This is not something Makefile should set nor users should pass
- * via CFLAGS.
+ * This shouldn't be set by the Makefile or by the user (e.g. via CFLAGS).
*/
#undef USE_CURL_MULTI