-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
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