GIT-CHERRY-PICK(1) Git Manual GIT-CHERRY-PICK(1) (NAME) git-cherry-pick - (SYNOPSIS) git cherry-pick [--edit] [-n] [-m ] [-s] [-x] [--ff] [-S[]] ... git cherry-pick (--continue | --skip | --abort | --quit) (DESCRIPTION) . (working tree) ( HEAD ). : 1. HEAD . 2. CHERRY_PICK_HEAD . 3. . 4. "TRUE MERGE" git-merge(1) . <<<<<<< >>>>>>> . 5. . git-merge(1) . (OPTIONS) ... . gitrevisions(7) . --no-walk git-rev-list(1) . ... ( maint master..next ). -e, --edit git cherry-pick . --cleanup= . git-commit(1) . scissors MERGE_MSG ( ) . -x "(cherry picked from commit ...)" . . . ( ) . -r -x -r . -x . -m , --mainline (mainline) . ( ) cherry-pick . -n, --no-commit . . HEAD . . . -s, --signoff Signed-off-by . signoff git-commit(1) . -S[], --gpg-sign[=], --no-gpg-sign GPG. keyid . --no-gpg-sign commit.gpgSign --gpg-sign . --ff HEAD (fast forward) . --allow-empty git commit --allow-empty . . "--ff" " " . ( ) . . --empty=keep . --allow-empty-message . . --empty=(drop|keep|stop) (redundant) . drop . keep . --allow-empty . stop . . --empty=drop --empty=stop . --empty=keep --allow-empty . --keep-redundant-commits --empty=keep. --strategy= . . MERGE STRATEGIES git-merge(1) . -X