Merge branch 'jn/gitweb-log-history'

diff --git a/Documentation/config.txt b/Documentation/config.txt
index d1e2120e15b37a14eec5b3d1de9752da8f6ad7af..cb73d7571f25deffb061441577ce1ae531fdf5d9 100644 (file)
--- a/Documentation/config.txt
+++ b/Documentation/config.txt
@@ -1360,7 +1360,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.