git-cherry-pick

问题 I\'m working on 2 different branches: release and development . I noticed I still need to integrate some changes that were committed to the release branch back into the development branch. The problem is I don\'t need all of the commit, only some hunks in certain files, so a simple git cherry-pick bc66559 does not do the trick. When I do a git show bc66559 I can see the diff but don\'t really know a good way of applying that partially to my current working tree. 回答1: The core thing you're

问题 Recently, I have been asked to cherry-pick a commit. So what does cherry-picking a commit in git mean? How do you do it? 回答1: 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 checkout master Execute the following: git cherry-pick <commit-hash> N.B.: If you cherry-pick

问题 I\'m using git on a new project that has two parallel -- but currently experimental -- development branches: master : import of existing codebase plus a few mods that I\'m generally sure of exp1 : experimental branch #1 exp2 : experimental branch #2 exp1 and exp2 represent two very different architectural approaches. Until I get further along I have no way of knowing which one (if either) will work. As I make progress in one branch I sometimes have edits that would be useful in the other

问题 I have the following repository layout: master branch (production) integration working What I want to achieve is to cherry pick a range of commits from the working branch and merge it into the integration branch. I pretty new to git and I can\'t figure out how to exactly do this (the cherry picking of commit ranges in one operation not the merging) without messing the repository up. Any pointers or thoughts on this? Thanks! 回答1: When it comes to a range of commits, cherry-picking is was not