Git Cherry-pick & Patch

Cherry-pick lets you copy a single commit from one branch to another. It's useful when you want just one (or a few) changes, not everything from another branch.

A patch is a file with changes from one or more commits. You can share a patch or apply it to another repository, even if it's unrelated to your own.

Use patches to share changes as files, or when working across different repositories.

Copy a specific commit from another branch to your current branch:

This creates a new commit on your branch with the same changes.

Example: Edit Commit Message git cherry-pick abc1234 --edit

(or -n ) to apply the changes, but not create a commit yet. This lets you make more changes before committing:

Example: Cherry-pick Without Commit git cherry-pick abc1234 --no-commit

-x to add a line to the commit message showing where the commit came from:

Example: Cherry-pick With Origin git cherry-pick abc1234 -x

If there are conflicts, Git will pause and ask you to fix them. After fixing, run:

Example: Continue After Conflict git add .

Example: Abort Cherry-pick git cherry-pick --abort

Make a patch file from a commit:

Example: Create Patch git format-patch -1 abc1234

Example: Multiple Commits git format-patch HEAD~3

Apply a patch file to your current branch:

Example: Apply Patch git apply 0001-some-change.patch

Use git am to apply a patch and keep the original author and message:

Example: Apply Patch with Metadata git am 0001-some-change.patch

Undo the changes in a patch file:

Example: Reverse Patch git apply -R 0001-some-change.patch

Use patches to share changes as files or work across repositories. If you want to keep commit history and authors, use git am instead of git apply. Troubleshooting & Best Practices

Make sure the patch matches your codebase. Sometimes you may need to adjust manually. Keep your branches up to date: