How to move certain commits to be based on another branch in git

Question

The situation    master is at X quickfix1 is at X   2 commits   Such that   o-o-X  master HEAD               q1a--q1b  quickfix1 HEAD    Then I started working on quickfix2  but by accident took quickfix1 as the source branch to copy  not the master  Now quickfix2 is at X   2 commits   2 relevant commits   o-o-X  master HEAD               q1a--q1b  quickfix1 HEAD                                 q2a--q2b  quickfix2 HEAD    Now I want to have a branch with quickfix2  but without the 2 commits that belong to quickfix1         q2a --q2b   quickfix2 HEAD         o-o-X  master HEAD                q1a--q1b  quickfix1 HEAD    I tried to create a patch from a certain revision in quickfix2  but the patch doesn t preserve the commit history  Is there a way to save my commit history  but have a branch without changes in quickfix1

User · Answer

on your branch that holds the commit you want to pass   git log    copy the commit hash found   git checkout  branch that will copy the commit    git reset --hard  hash of the commit you want to copy from the other branch     remove the  brackets    Other more useful commands here with explanation  Git Guide

User · Answer

You can use git cherry-pick to just pick the commit that you want to copy over   Probably the best way is to create the branch out of master  then in that branch use git cherry-pick on the 2 commits from quickfix2 that you want

User · Answer

I believe it s   git checkout master git checkout -b good quickfix2 git cherry-pick quickfix2  git cherry-pick quickfix2

User · Answer

This is a classic case of rebase --onto      let s go to current master  X  where quickfix2 should begin   git checkout master     replay every commit  after  quickfix1 up to quickfix2 HEAD   git rebase --onto master quickfix1 quickfix2    So you should go from  o-o-X  master HEAD                q1a--q1b  quickfix1 HEAD                                 q2a--q2b  quickfix2 HEAD    to         q2a --q2b   new quickfix2 HEAD         o-o-X  master HEAD                q1a--q1b  quickfix1 HEAD    This is best done on a clean working tree  See git config --global rebase autostash true  especially after Git 2 10

User · Answer

The simplest thing you can do is cherry picking a range  It does the same as the rebase --onto but is easier for the eyes     git cherry-pick quickfix1  quickfix2

[git] How to move certain commits to be based on another branch in git?

Examples related to git

Examples related to commit

Examples related to patch