receive-pack: allow using --strict mode for unpacking objects

diff --git a/Documentation/git-cherry-pick.txt b/Documentation/git-cherry-pick.txt
index 3bcc12c132b38008d007ed237e3641df326673af..f0beb412e655f0e188b8a1427b41f72b6cc61239 100644 (file)
--- a/Documentation/git-cherry-pick.txt
+++ b/Documentation/git-cherry-pick.txt
@@ -24,7 +24,7 @@ OPTIONS
 
 -e|--edit::
        With this option, `git-cherry-pick` will let you edit the commit
-       message prior committing.
+       message prior to committing.
 
 -x::
        When recording the commit, append to the original commit
@@ -45,7 +45,7 @@ OPTIONS
        default is not to do `-x` so this option is a no-op.
 
 -m parent-number|--mainline parent-number::
-       Usually you cannot revert a merge because you do not know which
+       Usually you cannot cherry-pick a merge because you do not know which
        side of the merge should be considered the mainline.  This
        option specifies the parent number (starting from 1) of
        the mainline and allows cherry-pick to replay the change