Merge branch 'jk/noetcconfig'

diff --git a/Documentation/git-http-push.txt b/Documentation/git-http-push.txt
index 3a69b719b5cdddc9f48cdbfefe358783e12f396d..0b827223429f61ebd7fff7a1ab85ab6d25dda04a 100644 (file)
--- a/Documentation/git-http-push.txt
+++ b/Documentation/git-http-push.txt
@@ -15,6 +15,9 @@ 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
+not to work and sometimes corrupts repository.
 
 OPTIONS
 -------
@@ -98,4 +101,4 @@ Documentation by Nick Hengeveld
 
 GIT
 ---
-Part of the gitlink:git[7] suite
+Part of the linkgit:git[7] suite