Merge branch 'master' into next

diff --git a/Documentation/git-cherry-pick.txt b/Documentation/git-cherry-pick.txt
index a7a883b83a6d3fcdaf217f7986ef085bd800d833..4f323fa42a5be3feffb7eb93fd5406804b48482b 100644 (file)
--- a/Documentation/git-cherry-pick.txt
+++ b/Documentation/git-cherry-pick.txt
@@ -20,11 +20,11 @@ OPTIONS
 <commit>::
        Commit to cherry-pick.
 
---edit::
+-e|--edit::
        With this option, `git-cherry-pick` will let you edit the commit
        message prior committing.
 
--r::
+-r|--replay::
        Usually the command appends which commit was
        cherry-picked after the original commit message when
        making a commit.  This option, '--replay', causes it to
@@ -32,7 +32,7 @@ OPTIONS
        when you are reordering the patches in your private tree
        before publishing.
 
--n::
+-n|--no-commit::
        Usually the command automatically creates a commit with
        a commit log message stating which commit was
        cherry-picked.  This flag applies the change necessary