upload-pack: add object filtering for partial clone

diff --git a/Documentation/merge-options.txt b/Documentation/merge-options.txt
index 6d85a76872ff722f18aba6e4d295d26e3922c090..2552ab8e8d5104d09c1c95010ab028068c7d18ae 100644 (file)
--- a/Documentation/merge-options.txt
+++ b/Documentation/merge-options.txt
@@ -39,7 +39,7 @@ set to `no` at the beginning of them.
 
 --ff-only::
        Refuse to merge and exit with a non-zero status unless the
-       current `HEAD` is already up-to-date or the merge can be
+       current `HEAD` is already up to date or the merge can be
        resolved as a fast-forward.
 
 -S[<keyid>]::