A cherry-pick takes the patch that was introduced in a commit and tries to reapply it on the branch you’re currently on.
|-e, --edit||With this option, |
|-x||When recording the commit, append a line that says "(cherry picked from commit …)" to the original commit message in order to indicate which commit this change was cherry-picked from. This is done only for cherry picks without conflicts.|
|--ff||If the current HEAD is the same as the parent of the cherry-pick’ed commit, then a fast forward to this commit will be performed.|
|--continue||Continue the operation in progress using the information in .git/sequencer. Can be used to continue after resolving conflicts in a failed cherry-pick or revert.|
|--quit||Forget about the current operation in progress. Can be used to clear the sequencer state after a failed cherry-pick or revert.|
|--abort||Cancel the operation and return to the pre-sequence state.|