Merge branch 'jh/filter-empty-contents'

diff --git a/Documentation/config.txt b/Documentation/config.txt
index 0f668bbe11a5b439fca53ca7aa52a43782e30b79..5f76e8cf4e5251d4bd414f9739247c752366070d 100644 (file)
--- a/Documentation/config.txt
+++ b/Documentation/config.txt
@@ -2061,7 +2061,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