Top "Cherry-pick" questions

In source control management, the act of selectively pulling single changes from peer to peer is called "cherry-pick".

What are the differences between git cherry-pick and git show | patch -p1?

I ran into a situation where git cherry-pick X would have some conflicts, but also created extra inserts (when verified …

git cherry-pick
Git - Cherry picking with ours/theirs strategy

I wonder if there is any way of cherry picking with ours/theirs strategy. On other words, I want to …

git commit git-merge merge-conflict-resolution cherry-pick
Git: move changes between branches without working directory change

Use-case: every time I want to move commit from one git branch to another I perform the following sequence of …

git cherry-pick git-checkout
Issue with cherry pick: changes from previous commits are also applied

In my project, I released a version several months ago. After that release, I have done many changes on the …

git cherry-pick git-cherry-pick
Git workflow and Gerrit

I am trying to implement a 'git-flow' kind of workflow using Gerrit but I can't seem to figure out the …

git rebase gerrit cherry-pick git-flow
git cherry-pick to another branch

I wonder if there is the way to copy one commit to another branch without checking out that branch. For …

git branch cherry-pick
Why is git log --cherry-pick not removing equivalent commits?

I have been trying to use git log --no-merges --cherry-pick --right-only master...my-branch to generate a list of commits that …

git git-log cherry-pick git-cherry-pick
In a Git cherry-pick or rebase merge conflict, how are BASE (aka "the ancestor"), LOCAL, and REMOTE determined?

In a normal Git merge conflict, the three versions of a file in play for the three-way merge are roughly …

git cherry-pick git-cherry-pick
git says everything-up-to-date when pushing changes to a remote branch

i have commits that are in a remote repository (origin/master) which i want to put in a branch created …

git push git-checkout cherry-pick
Error pushing changes on GIT. Ref names must follow git ref-format rules

I have one error using git on Sourcetree. I've created a local branch called sprints/Mycompany_sprint_1 (because I want …

git git-branch cherry-pick remote-branch