You have to supply -m if the commit is a merge commit, i.e. a commit with more than one parent. Normally, what git cherry-pick REV does can be described as: Take the changes between rev and its parent. Apply these changes to the current HEAD and commit the result with rev‘s commit message. A merge … Read more
Problem: You want to test a feature someone has developed, but it only exists in a remote branch which is woefully out of date. If you merged or rebased, you’d get a bunch of old changes in, possibly conflicting. With cherry picking, you take one change set, and replay that as a new commit over … Read more
The core thing you’re going to want here is git add -p (-p is a synonym for –patch). This provides an interactive way to add in content, letting you decide whether each hunk should go in or not, and even letting you manually edit the patch if necessary. To use it in combination with cherry-pick: … Read more
The way a cherry-pick works is by taking the diff a changeset represents (the difference between the working tree at that point and the working tree of its parent), and applying it to your current branch. So, if a commit has two or more parents, it also represents two or more diffs – which one … Read more
I had the exact same problem as mentioned by you above. But I found this clearer in explaining the answer. Summary: Check out the path(s) from the branch you want to merge, $ git checkout source_branch — <paths>… Hint: It also works without `–` like seen in the linked post. or to selectively merge hunks … Read more
When it comes to a range of commits, cherry-picking is was not practical. As mentioned below by Keith Kim, Git 1.7.2+ introduced the ability to cherry-pick a range of commits (but you still need to be aware of the consequence of cherry-picking for future merge) git cherry-pick” learned to pick a range of commits (e.g. … Read more
Cherry picking in Git means to choose a commit from one branch and apply it onto another. This is in contrast with other ways such as merge and rebase which normally apply many commits onto another branch. Make sure you are on the branch you want to apply the commit to. git switch master Execute … Read more
From https://git-scm.com/docs/git-cherry-pick -m parent-number –mainline parent-number Usually you cannot cherry-pick a merge because you do not know which side of the merge should be considered the mainline. This option specifies the parent number (starting from 1) of the mainline and allows cherry-pick to replay the change relative to the specified parent. I guess you are … Read more