Merge branch 'jn/editor-pager'

diff --git a/Documentation/config.txt b/Documentation/config.txt
index 5181b7762946b011bff51c152393631f72d5d294..c9b8db5cf701fa39fc518dd196c4acfb57cac0c4 100644 (file)
--- a/Documentation/config.txt
+++ b/Documentation/config.txt
@@ -1358,7 +1358,7 @@ receive.denyCurrentBranch::
 
 receive.denyNonFastForwards::
        If set to true, git-receive-pack will deny a ref update which is
-       not a fast forward. Use this to prevent such an update via a push,
+       not a fast-forward. Use this to prevent such an update via a push,
        even if that push is forced. This configuration variable is
        set when initializing a shared repository.