Git Cherry-Pick
git_cherry_pickApply specific commits from other branches to your current branch without full merges. Resolve conflicts, configure merge strategies, and optionally stage changes only for controlled integration.
Instructions
Cherry-pick commits from other branches. Apply specific commits to the current branch without merging entire branches.
Input Schema
| Name | Required | Description | Default |
|---|---|---|---|
| path | No | Path to the Git repository. Defaults to session working directory set via git_set_working_dir. | . |
| commits | Yes | Commit hashes to cherry-pick. | |
| noCommit | No | Don't create commit (stage changes only). | |
| continueOperation | No | Continue cherry-pick after resolving conflicts. | |
| abort | No | Abort cherry-pick operation. | |
| mainline | No | For merge commits, specify which parent to follow (1 for first parent, 2 for second, etc.). | |
| strategy | No | Merge strategy to use for cherry-pick. | |
| signoff | No | Add Signed-off-by line to the commit message. |
Output Schema
| Name | Required | Description | Default |
|---|---|---|---|
| success | Yes | Indicates if the operation was successful. | |
| pickedCommits | Yes | Commits that were successfully cherry-picked. | |
| conflicts | Yes | Whether operation had conflicts. | |
| conflictedFiles | Yes | Files with conflicts that need resolution. |