How to copy commits from one branch to another

Question

I ve got two branches from my master    v2 1   version 2  I ve been working on for several months wss  that I created yesterday to add one specific feature to my master  in production    Is there a way to copy yesterday s commits from wss to v2 1

User · Answer

Use   git cherry-pick  lt commit gt    to apply  lt commit gt  to your current branch    I myself would probably cross-check the commits I pick in gitk and cherry-pick them with right-clicks on the commit entry there instead     If you want to go more automatic  with all its dangers  and assuming all commits since yesterday happened on wss you could generate the list of commits using git log  with --pretty suggested by Jefromi   git log --reverse --since yesterday --pretty  H   so everything together assuming you use bash  for commit in   git log --reverse --since yesterday --pretty  H   do     git cherry-pick  commit done   If something goes wrong here  there is a lot of potential  you are in trouble since this works on the live checkout  so either do manual cherry-picks or use rebase like suggested by Jefromi

User · Answer

Suppose I have committed changes to master branch I will get the commit id xyz  of the commit now i have to go to branch for which i need to push my commits  Single commit id xyx git checkout branch-name git cherry-pick xyz git push origin branch-name  Multiple commit id s xyz abc qwe git checkout branch-name git cherry-pick xyz abc qwe git push origin branch-name

User · Answer

Or if You are little less on the evangelist s side You can do a little ugly way I m using  In deploy template there are commits I want to copy on my master as branch deploy   git branch deploy deploy template git checkout deploy git rebase master   This will create new branch deploy  I use -f to overwrite existing deploy branch  on deploy template  then rebase this new branch onto master  leaving deploy template untouched

User · Answer

git cherry-pick   Apply the changes introduced by some existing commits  Assume we have branch A with  X  Y  Z  commits  We need to add these commits to branch B  We are going to use the cherry-pick operations   When we use cherry-pick  we should add commits on branch B in the same chronological order that the commits appear in Branch A   cherry-pick does support a range of commits  but if you have merge commits in that range  it gets really complicated  git checkout B git cherry-pick SHA-COMMIT-X git cherry-pick SHA-COMMIT-Y git cherry-pick SHA-COMMIT-Z   Example of workflow      We can use cherry-pick with options   -e or --edit   With this option  git cherry-pick will let you edit the commit message prior to committing   -n or --no-commit   Usually the command automatically creates a sequence of commits  This flag applies the changes necessary to cherry-pick each named commit to your working tree and the index  without making any commit  In addition  when this option is used  your index does not have to match the HEAD commit  The cherry-pick is done against the beginning state of your index   Here an interesting article  concerning cherry-pick

User · Answer

For the simple case of just copying the last commit from branch wss to v2 1  you can simply grab the commit id  git log --oneline   head -n 1  and do   git checkout v2 1 git merge  lt commit gt

User · Answer

You could create a patch from the commits that you want to copy and apply the patch to the destination branch

User · Answer

Here s another approach  git checkout  SOURCE BRANCH                  switch to Source branch  git checkout  COMMIT HASH                    go back to the desired commit  git checkout -b  temp branch                 create a new temporary branch from  COMMIT HASH  snapshot  git checkout  TARGET BRANCH                  switch to Target branch  git merge  temp branch                       merge code to your Target branch  git branch -d  temp branch                   delete the temp branch

User · Answer

You should really have a workflow that lets you do this all by merging   - x - x - x  v2  - x - x - x  v2 1                           x - x - x  wss    So all you have to do is git checkout v2 1 and git merge wss  If for some reason you really can t do this  and you can t use git rebase to move your wss branch to the right place  the command to grab a single commit from somewhere and apply it elsewhere is git cherry-pick  Just check out the branch you want to apply it on  and run git cherry-pick  lt SHA of commit to cherry-pick gt    Some of the ways rebase might save you   If your history looks like this   - x - x - x  v2  - x - x - x  v2 1                           x - x - x  v2-only  - x - x - x  wss    You could use git rebase --onto v2 v2-only wss to move wss directly onto v2   - x - x - x  v2  - x - x - x  v2 1                            x - x - x  v2-only                            x - x - x  wss    Then you can merge  If you really  really  really can t get to the point where you can merge  you can still use rebase to effectively do several cherry-picks at once     wss-starting-point is the SHA1 branch immediately before the first commit to rebase git branch wss-to-rebase wss git rebase --onto v2 1 wss-starting-point wss-to-rebase git checkout v2 1 git merge wss-to-rebase   Note  the reason that it takes some extra work in order to do this is that it s creating duplicate commits in your repository  This isn t really a good thing - the whole point of easy branching and merging is to be able to do everything by making commit s  one place and merging them into wherever they re needed  Duplicate commits mean an intent never to merge those two branches  if you decide you want to later  you ll get conflicts

User · Answer

The cherry-pick command can read the list of commits from the standard input   The following command cherry-picks commits authored by the user John that exist in the  develop  branch but not in the  release  branch  and does so in the chronological order   git log develop --not release --format  H --reverse --author John   git cherry-pick --stdin

[git] How to copy commits from one branch to another?

Examples related to git

Examples related to branching-and-merging