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

diff --git a/Documentation/config.txt b/Documentation/config.txt
index 2e5ceaf71974b1e5404de79103648da1829eaf42..f45bef13ae57e6f67e8a6559e81d75c9610b3734 100644 (file)
--- a/Documentation/config.txt
+++ b/Documentation/config.txt
@@ -2033,7 +2033,7 @@ pull.ff::
        a case (equivalent to giving the `--no-ff` option from the command
        line). When set to `only`, only such fast-forward merges are
        allowed (equivalent to giving the `--ff-only` option from the
-       command line).
+       command line). This setting overrides `merge.ff` when pulling.
 
 pull.rebase::
        When true, rebase branches on top of the fetched branch, instead