How to cherry-pick multiple commits

Question

I have two branches  Commit a is the head of one  while the other has b  c  d  e and f on top of a  I want to move c  d  e and f to first branch without commit b  Using cherry pick it is easy  checkout first branch cherry-pick one by one c to f and rebase second branch onto first  But is there any way to cherry-pick all c-f in one command   Here is a visual description of the scenario  thanks JJD

User · Answer

You can use a serial combination of git rebase and git branch to apply a group of commits onto another branch  As already posted by wolfc the first command actually copies the commits  However  the change is not visible until you add a branch name to the top most commit of the group   Please open the picture in a new tab        To summarize the commands in text form    Open gitk as a independent process using the command  gitk --all  amp   Run git rebase --onto a b f  Press F5 in gitk  Nothing changes  But no HEAD is marked  Run git branch selection Press F5 in gitk  The new branch with its commits appears    This should clarify things    Commit a is the new root destination of the group  Commit b is the commit before the first commit of the group  exclusive   Commit f is the last commit of the group  inclusive     Afterwards  you could use git checkout feature  amp  amp  git reset --hard b to delete the commits c till f from the feature branch   In addition to this answer  I wrote a blog post which describes the commands in another scenario which should help to generally use it

User · Answer

git format-patch --full-index --binary --stdout range      git am -3

User · Answer

If you have selective revisions to merge  say A  C  F  J from A B C D E F G H I J commits  simply use below command      git cherry-pick A C F J

User · Answer

Git 1 7 2 introduced the ability to cherry pick a range of commits  From the release notes      git cherry-pick learned to pick a range of commits    e g  cherry-pick A  B and cherry-pick --stdin   so did git revert  these do not support the nicer sequencing control rebase  -i  has  though    To cherry-pick all the commits from commit A to commit B  where A is older than B   run   git cherry-pick A   B   If you want to ignore A itself  run   git cherry-pick A  B    Credit goes to damian  J  B  Rainsberger and sschaef in the comments

User · Answer

To cherry pick from a commit id up to the tip of the branch  you can use      git cherry-pick commit id   branch name

User · Answer

To apply J  B  Rainsberger and sschaef s comments to specifically answer the question    To use a cherry-pick range on this example   git checkout a git cherry-pick b  f   or  git checkout a git cherry-pick c   f

User · Answer

The simplest way to do this is with the onto option to rebase  Suppose that the branch which current finishes at a is called mybranch and this is the branch that you want to move c-f onto     checkout mybranch git checkout mybranch    reset it to f  currently includes a  git reset --hard f    rebase every commit after b and transplant it onto a git rebase --onto a b

User · Answer

Or the requested one-liner   git rebase --onto a b f

User · Answer

Another variant worth mentioning is that if you want the last n commits from a branch  the   syntax can be useful   git cherry-pick some-branch 4  some-branch   In this case  the above command would pick the last 4 commits from a branch called some-branch  though you could also use a commit hash in place of a branch name

User · Answer

git rev-list --reverse b  f   xargs -n 1 git cherry-pick

User · Answer

Actually  the simplest way to do it could be to    record the merge-base between the two branches  MERGE BASE   git merge-base branch-a branch-b  fast-forward or rebase the older branch onto the newer branch rebase the resulting branch onto itself  starting at the merge base from step 1  and manually remove commits that are not desired   git rebase   SAVED MERGE BASE  -i   Alternatively  if there are only a few new commits  skip step 1  and simply use  git rebase HEAD        -i   in the first step  using enough   to move past the merge-base    You will see something like this in the interactive rebase   pick 3139276 commit a pick c1b421d commit b pick 7204ee5 commit c pick 6ae9419 commit d pick 0152077 commit e pick 2656623 commit f   Then remove lines b  and any others you want

User · Answer

Here s a script that will allow you to cherry-pick multiple commits in a row simply by telling the script which source and target branches for the cherry picks and the number of commits   https   gist github com nickboldt 99ac1dc4eb4c9ff003a1effef2eb2d81  To cherry-pick from your branch to master  uses the current branch as source      gcpl sh -m   To cherry-pick the latest 5 commits from your 6 19 x branch to master     gcpl sh -c 5 -s 6 19 x -t master

[git] How to cherry-pick multiple commits

Examples related to git

Examples related to git-rebase

Examples related to cherry-pick