pull: make pull.ff=true override merge.ff

diff --git a/Documentation/git-imap-send.txt b/Documentation/git-imap-send.txt
index 77aacf130936435970a945e4d687d01c12b1a0f9..5d1e4c80cd5d479a43c39ffb12b66a7302e754e7 100644 (file)
--- a/Documentation/git-imap-send.txt
+++ b/Documentation/git-imap-send.txt
@@ -44,7 +44,8 @@ OPTIONS
 
 --no-curl::
        Talk to the IMAP server using git's own IMAP routines instead of
-       using libcurl.
+       using libcurl.  Ignored if Git was built with the NO_OPENSSL option
+       set.
 
 
 CONFIGURATION