Merge branch 'jc/pathcheck'

diff --git a/Documentation/git-cherry-pick.txt b/Documentation/git-cherry-pick.txt
index 744f2c9ce29d5a245fdf3266bebde624308545ee..bfa950ca19c701bd3837a874bbeeb18b440ed44f 100644 (file)
--- a/Documentation/git-cherry-pick.txt
+++ b/Documentation/git-cherry-pick.txt
@@ -3,7 +3,7 @@ git-cherry-pick(1)
 
 NAME
 ----
-git-cherry-pick - Apply the change introduced by an existing commit.
+git-cherry-pick - Apply the change introduced by an existing commit
 
 SYNOPSIS
 --------
@@ -20,7 +20,7 @@ OPTIONS
 <commit>::
        Commit to cherry-pick.
 
---edit::
+-e|--edit::
        With this option, `git-cherry-pick` will let you edit the commit
        message prior committing.