How to create the branch from specific commit in different branch

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.

Related Posts:

  1. How do I delete a Git branch locally and remotely?
  2. How do I delete a Git branch locally and remotely?
  3. How do I rename a local Git branch?
  4. How can I switch to another branch in git?
  5. How to remove local (untracked) files from the current Git working tree
  6. Git merge hotfix branch into feature branch
  7. GitHub: Permission denied (publickey). fatal: Could not read from remote repository
  8. Git fetch remote branch
  9. How do I clone a specific Git branch? [duplicate]
  10. git – remote add origin vs remote set-url origin
  11. GitHub Error Message – Permission denied (publickey)
  12. Git fetch remote branch
  13. How do I push a new local branch to a remote Git repository and track it too?
  14. How do I push a new local branch to a remote Git repository and track it too?
  15. Updating a local repository with changes from a GitHub repository
  16. Git push results in “Authentication Failed”
  17. github changes not staged for commit
  18. Git : fatal: Could not read from remote repository. Please make sure you have the correct access rights and the repository exists
  19. Git push results in “Authentication Failed”
  20. Download single files from GitHub
  21. How do I push a new local branch to a remote Git repository and track it too?
  22. How do I pull my project from github?
  23. Difference between Git and GitHub
  24. How to solve SSL certificate: self signed certificate when cloning repo from github?
  25. How to get just one file from another branch?
  26. How to find my GitHub username so that I can be found via the URL?
  27. How do I rename both a Git local and remote branch name?
  28. Create Git branch with current changes
  29. github website publish cannot publish unborn HEAD
  30. fatal: The current branch master has no upstream branch
  31. How do you create a remote Git branch?
  32. Move the most recent commit(s) to a new branch with Git
  33. Create a tag in a GitHub repository
  34. Git: Could not resolve host github.com error while cloning remote repository in git
  35. How to pull a specific branch from Github
  36. Move the most recent commit(s) to a new branch with Git
  37. Make an existing Git branch track a remote branch?
  38. How do I call git diff on the same file between 2 different local branches?
  39. GitHub: invalid username or password
  40. How to get the current branch name in Git?
  41. How do you create a remote Git branch?
  42. Trying to git pull with error: cannot open .git/FETCH_HEAD: Permission denied
  43. How do I update or sync a forked repository on GitHub?
  44. Can I share my private GitHub repository by link?
  45. There is no tracking information for the current branch
  46. Git push results in “Authentication Failed”
  47. Meaning of the GitHub message: push declined due to email privacy restrictions
  48. How to rename a directory/folder on GitHub website?
  49. “*** Please tell me who you are.” when using SSH key
  50. Download a single folder or directory from a GitHub repo
  51. Pull request vs Merge request
  52. Branch from a previous commit using Git
  53. Clone A Private Repository (Github)
  54. How do I rename a repository on GitHub?
  55. error: cannot lock ref.. ‘refs/tags’ exists; cannot create ‘refs/tags/
  56. Not a valid object name: ‘master’
  57. Git: Installing Git in PATH with GitHub client for Windows
  58. ! [rejected] master -> master (fetch first)
  59. How do I copy a version of a single file from one Git branch to another?
  60. Git pull origin overwrites master?
  61. How to git add a whole folder
  62. My new Github page isn’t showing up
  63. How can I remove a commit on GitHub?
  64. Unity Collaborate vs GitHub
  65. Move existing, uncommitted work to a new branch in Git
  66. “fatal: HttpRequestException encountered.” Error with GitHub/Bitbucket Repositories due to dropping TLS-1.0 support
  67. SourceTree keeps asking for Github password
  68. Delete branches in Bitbucket
  69. How do I set up Eclipse/EGit with GitHub?
  70. How to change the license for a project at Github?
  71. How do I push a local Git branch to master branch in the remote?
  72. Why I always Got Error “Push to origin/master was rejected”?
  73. Git lfs – “this exceeds GitHub’s file size limit of 100.00 MB”
  74. Github Windows ‘Failed to sync this branch’
  75. fatal: could not read Username for ‘https://github.com’: No such file or directory
  76. Github Authentication Failed – … GitHub does not provide shell access
  77. How to update a branch with master on GitHub
  78. How do I pull files from remote without overwriting local files?
  79. Git keeps prompting me for a password
  80. git push origin master does not work
  81. How to keep a branch synchronized/updated with master?
  82. Can I arrange repositories into folders on Github?
  83. Delete forked repo from GitHub
  84. Found a swap file by the name
  85. How to discard local changes and pull latest from GitHub repository
  86. How do I run git log to see changes only for a specific branch?
  87. How to create a local branch from an existing remote branch?
  88. Differences between Commit, Commit and Push, Commit and Sync
  89. How can I delete all Git branches which have been merged?
  90. key_load_public: invalid format
  91. How to find which git branch I am on when my disk is mounted on other server
  92. Git push hangs when pushing to Github?
  93. How to create a new branch from a tag?
  94. Git: Where exactly is the “working directory”?
  95. Create empty branch on GitHub
  96. Import existing source code to GitHub
  97. Git push requires username and password
  98. GIT and Development URL’s point to production
  99. Is it possible to checkout a beta version of WordPress via github?
  100. how can I create a WP offline environment before releasing the websites? [closed]

Leave a Comment