Merge branch 'jc/diff' into next
[gitweb.git] / Documentation / git-cherry-pick.txt
index 744f2c9ce29d5a245fdf3266bebde624308545ee..4f323fa42a5be3feffb7eb93fd5406804b48482b 100644 (file)
@@ -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.