http.c: fix parsing of http.sslCertPasswordProtected variable

diff --git a/Documentation/merge-options.txt b/Documentation/merge-options.txt
index a0f022b41df07b3f2d431a9f284d63ce040a55ad..2adccf8fec71c10f8223490f1be4b2a215ace5ea 100644 (file)
--- a/Documentation/merge-options.txt
+++ b/Documentation/merge-options.txt
@@ -30,7 +30,8 @@ set to `no` at the beginning of them.
 
 --no-ff::
        Create a merge commit even when the merge resolves as a
-       fast-forward.
+       fast-forward.  This is the default behaviour when merging an
+       annotated (and possibly signed) tag.
 
 --ff-only::
        Refuse to merge and exit with a non-zero status unless the