Merge branch 'hm/maint-imap-send-crlf' into maint

diff --git a/Documentation/git-cherry-pick.txt b/Documentation/git-cherry-pick.txt
index b764130d26eb750d2b5173dcc98366828e413046..78f4714da0c226b9523f60f247f60ab13119c7c7 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
+       With this option, 'git cherry-pick' will let you edit the commit
        message prior to committing.
 
 -x::