Just go with: $ git cherry-pick another_branch This will cherry-pick the last commit from another_branch. Branches in git are just references to the last commit in that branch, you can use them instead of commit SHAs in your commands.
Before proceeding: Install a proper mergetool. On Linux, I strongly suggest you to use meld: sudo apt-get install meld Configure your mergetool: git config –global merge.tool meld Then, iterate in the following way: git cherry-pick …. git mergetool git cherry-pick –continue
It seems that cherry-pick does what we want in terms of only getting changes from selected commits, but I would really like a way to cherry-pick all commits in a given branch at once, without having to look up the commit ids every time. Using cherry-pick git cherry-pick allows you to pick any commits you … Read more
Next time try git cherry-pick –abort, otherwise what you did should more or less work.
You can tell it to always prefer the changes of the commit you are cherry-picking: git cherry-pick commitish –strategy-option theirs commitish can be a SHA-1 hash of a commit, or a branch-name for the lastest commit of that branch, branch-name~1 for the commit before that etc. If you want to do the reverse, use: git … Read more
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
Pass -n to git cherry-pick. This will apply all the commits, but not commit them. Then simply do git commit to commit all the changes in a single commit.
When you cherry-pick, it creates a new commit with a new SHA. If you do: git cherry-pick -x <sha> then at least you’ll get the commit message from the original commit appended to your new commit, along with the original SHA, which is very useful for tracking cherry-picks.
Sure, being in master branch all you need to do is: git merge <commit-id> where commit-id is hash of the last commit from newbranch that you want to get in your master branch. You can find out more about any git command by doing git help <command>. It that case it’s git help merge. And … Read more
You can do the following git cherry-pick –abort From the git cherry-pick docs –abort Cancel the operation and return to the pre-sequence state.