index 877ab66ef5c032af09ace5597bac64fd7739f468..a691173ba13370330b97907cf751342cf1c0fe44 100644 (file)
SYNOPSIS
--------
-'git-cherry-pick' [--edit] [-n] [-m parent-number] [-x] <commit>
+'git cherry-pick' [--edit] [-n] [-m parent-number] [-s] [-x] <commit>
DESCRIPTION
-----------
-------
<commit>::
Commit to cherry-pick.
- For a more complete list of ways to spell commits, see
+ For a more complete list of ways to spell commits, see the
"SPECIFYING REVISIONS" section in linkgit:git-rev-parse[1].
--e|--edit::
- With this option, `git-cherry-pick` will let you edit the commit
+-e::
+--edit::
+ With this option, 'git-cherry-pick' will let you edit the commit
message prior to committing.
-x::
described above, and `-r` was to disable it. Now the
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
+-m parent-number::
+--mainline parent-number::
+ 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
relative to the specified parent.
--n|--no-commit::
+-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
This is useful when cherry-picking more than one commits'
effect to your working tree in a row.
+-s::
+--signoff::
+ Add Signed-off-by line at the end of the commit message.
+
Author
------
GIT
---
-Part of the linkgit:git[7] suite
+Part of the linkgit:git[1] suite