How to create the branch from specific commit in different branch

Question

I have made several commits in the master branch and then merged them to dev branch   I want to create a branch from a specific commit in dev branch  which was first committed in master branch   I used the commands   git checkout dev git branch   lt branch name gt   lt commit id gt    However  this creates the branch from master branch  not the dev branch I expected  The commit id is same in master branch and dev branch  So  how can I distinguish same commit id in different branch   PS  I made an example in github here https   github com RolandXu test for branch  I used the commands   git checkout dev git branch test 07aeec983bfc17c25f0b0a7c1d47da8e35df7af8   What I expect is that the test branch contains aa txt bb txt cc txt  However  the test branch only contains aa txt and cc txt  It most likely created the branch from the master branch

User · Answer

Try  git checkout  lt commit hash gt  git checkout -b new branch   The commit should only exist once in your tree  not in two separate branches   This allows you to check out that specific commit and name it what you will

User · Answer

You can do this locally as everyone mentioned using  git checkout -b  lt branch-name gt   lt sha1-of-commit gt    Alternatively  you can do this in github itself  follow the steps    1- In the repository  click on the Commits   2- on the commit you want to branch from  click on  lt  gt  to browse the repository at this point in the history     3- Click on the tree  xxxxxx in the upper left  Just type in a new branch name there click Create branch xxx as shown below     Now you can fetch the changes from that branch locally and continue from there

User · Answer

You have the arguments in the wrong order   git branch  lt branch-name gt   lt commit gt    and for that  it doesn t matter what branch is checked out  it ll do what you say   If you omit the commit argument  it defaults to creating a branch at the same place as the current one    If you want to check out the new branch as you create it   git checkout -b  lt branch gt   lt commit gt    with the same behavior if you omit the commit argument

User · Answer

You have to do   git branch  lt branch name gt   lt commit gt     you were interchanging the branch name and commit   Or you can do   git checkout -b  lt branch name gt   lt commit gt    If in place of  you use branch name  you get a branch out of tip of the branch

User · Answer

If you are using this form of the branch command  with start point   it does not matter where your HEAD is   What you are doing   git checkout dev git branch test 07aeec983bfc17c25f0b0a7c1d47da8e35df7af8    First  you set your HEAD to the branch dev  Second  you start a new branch on commit 07aeec98  There is no bb txt at this commit  according to your github repo     If you want to start a new branch at the location you have just checked out  you can either run branch with no start point   git branch test   or as other have answered  branch and checkout there in one operation   git checkout -b test     I think that you might be confused by that fact that 07aeec98 is part of the branch dev  It is true that this commit is an ancestor of dev  its changes are needed to reach the latest commit in dev  However  they are other commits that are needed to reach the latest dev  and these are not necessarily in the history of 07aeec98   8480e8ae  where you added bb txt  is for example not in the history of 07aeec98  If you branch from 07aeec98  you won t get the changes introduced by 8480e8ae   In other words  if you merge branch A and branch B into branch C  then create a new branch on a commit of A  you won t get the changes introduced in B   Same here  you had two parallel branches master and dev  which you merged in dev  Branching out from a commit of master  older than the merge  won t provide you with the changes of dev     If you want to permanently integrate new changes from master into your feature branches  you should merge master into them and go on  This will create merge commits in your feature branches  though   If you have not published your feature branches  you can also rebase them on the updated master  git rebase master featureA  Be prepared to solve possible conflicts   If you want a workflow where you can work on feature branches free of merge commits and still integrate with newer changes in master  I recommend the following    base every new feature branch on a commit of master create a dev branch on a commit of master when you need to see how your feature branch integrates with new changes in master  merge both master and the feature branch into dev    Do not commit into dev directly  use it only for merging other branches   For example  if you are working on feature A and B   a---b---c---d---e---f---g -master                             -x -featureB                 -j---k -featureA   Merge branches into a dev branch to check if they work well with the new master   a---b---c---d---e---f---g -master                                                       --x ---k  -dev                                                       -x----------         -featureB                                            -j---k--------------- -featureA   You can continue working on your feature branches  and keep merging in new changes from both master and feature branches into dev regularly   a---b---c---d---e---f---g---h---i----- -master                                                                    --x ---k ---i ---l  -dev                                                              -x----------                 -featureB                                                        -j---k-----------------l------ -featureA   When it is time to integrate the new features  merge the feature branches  not dev   into master

[git] How to create the branch from specific commit in different branch

Examples related to git

Examples related to git-branch