Cherry-pick some commits from one branch to another

This is pretty easy. Many of the guides online talk about using particular tools, so I just want to write down the technique used for the commandline.

First -- find the full SHA of the commits you want to cherry-pick.

If they are commits that have been merged into another branch -- then make sure to grab the original commit, not the merge commit. (if you grab the merge commit's SHA -- you'll end up with an error message that is pretty clear about the issue, so it's quite a recoverable error anyway)

The full SHA is quite long, eg. 5f8c11b8f5ca131fdc00776ac428cc9b0a90ee19

To cherry-pick that commit into the current branch:

git cherry-pick -x 5f8c11b8f5ca131fdc00776ac428cc9b0a90ee19

The -x is optional, recommended, -- if included it will get the commit message of the original commit, and append this to it:

(cherry picked from commit 5f8c11b8f5ca131fdc00776ac428cc9b0a90ee19)

... which I think is a nice and classy touch!

Cherry Pick for a hotfix

When creating a cherry pick for a hot-fix to main -- you probably want to follow this slightly more involved process, so that it becomes a pull request, not just a direct commit to main.

switch to the main branch, if you're not there already:
```
 git checkout main
```

create a new branch

 git checkout -b my-new-branch-name
 git push -u origin my-new-branch-name

cherry pick the commits you like into your new branch, e.g.:

 git cherry-pick -x 5f8c11b8f5ca131fdc00776ac428cc9b0a90ee19
 git cherry-pick -x b5728539028366e98a57855514549ad7e0776458

...If cherry picking a merge-commit (the result of a previously completed PR, for example) -- you also need to specify which side to take -- do that with -m 1.

	git cherry-pick -x -m 1 5f8c11b8f5ca131fdc00776ac428cc9b0a90ee19
	git cherry-pick -x -m 1 b5728539028366e98a57855514549ad7e0776458

(Optional) Look at your local outgoing commits to make sure you're about to push what you want to push....
```
 git log --branches --not --remotes=origin
```
Push to the remote -- so you can create a pull-request (PR) from there
```
 git push
```
(Optional...) switch back to main I guess...
```
 git checkout main
```

Immediately undo a cherry pick

If you've just cherry picked something and you want to undo it (immediately) -- you're essentially undoing a commit -- so you can:

git reset --hard HEAD~

...to get back to the previous state.

Cherry-pick some commits from one branch to another

Cherry Pick for a hotfix

Immediately undo a cherry pick

See also