What exactly do we mean by “branch”?

by

You are correct.

We can further split your item 1 by separating “local” and “remote” branch labels: local branches (local labels) are names that start (internally—many front-end command hide this) with refs/heads/, while “remote branches”—which are also called “remote-tracking branches”—start with refs/remotes/ and then have one more path component naming the specific remote before the part naming the branch. (Edit, April 2018: I dislike the phrase “remote branch” or “remote-tracking branch”; I think it’s better to just call these remote-tracking names. But there is a lot of existing documentation that uses the other two phrases, so we need to be aware of this usage.)

For instance, you are no doubt familiar with refs/remotes/origin/master, but if you have a remote named bob you might also have refs/remotes/bob/hacks/feep that tracks Bob’s hacks/feep.

A local branch name refs/heads/branch has the distinguishing feature that git checkout will put you “on” that branch by default, by writing that name into the special HEAD reference; and once it you are set up this way, new commits (created by git commit, git merge, git cherry-pick, etc.) cause the new commit’s SHA-1 to be written into the branch-file. (The new commit has as its parent, or one of its parents, the old tip-of-branch.)

I have attempted to use terms like “branch tip” to denote specifically the commit to which a branch name like refs/heads/master points, “branch name” or “local branch name” to refer to the name itself (whether prefixed by refs/heads/ or not), and—I think this is the least successful—”branch structure” to refer to the DAG subset. However, given a DAG with a fork-and-merge like this:

         o--o
        /    \
...-o--o      o--o-...
        \    /
         o--o

I sometimes want to refer to one or the other half of the little benzene-ring-like object as “a branch” as well, and I have no really good term for this.

(Incidentally, if you were a topologist, the fact that the Atlassian diagram can also be drawn linearly would not bother you. However, as the old joke goes, topologists keep trying to drink out of their donuts and eat their coffee mugs since each one is just a torus.)

More Related Contents:

  1. How do you create a remote Git branch?
  2. Definition of “downstream” and “upstream”
  3. How to find the nearest parent of a Git branch
  4. How to fetch all Git branches
  5. How can I delete all Git branches which have been merged?
  6. Trimming Git Commits/Squashing Git History
  7. What are the differences between git branch, fork, fetch, merge, rebase and clone?
  8. Git – how to force merge conflict and manual merge on selected file
  9. master branch and ‘origin/master’ have diverged, how to ‘undiverge’ branches’?
  10. How do you stop tracking a remote branch in Git?
  11. Rebasing a branch including all its children
  12. Using Git, show all commits that are in one branch, but not the other(s)
  13. How to get the changes on a branch in Git
  14. How do I fetch all Git branches?
  15. Can I make fast forwarding be off by default in git?
  16. How do I remove local (untracked) files from the current Git working tree?
  17. Depend on a branch or tag using a git URL in a package.json?
  18. Git push: “fatal ‘origin’ does not appear to be a git repository – fatal Could not read from remote repository.”
  19. Renaming branches remotely in Git
  20. Switch Git branch without files checkout
  21. Git: How to find out on which branch a tag is?
  22. Renaming a branch in GitHub
  23. Git: Merge a Remote branch locally
  24. Switch branch names in git
  25. Different default remote (tracking branch) for git pull and git push
  26. Block a git branch from being pushed
  27. Get all files that have been modified in git branch
  28. Git and working on multiple branches
  29. Can git permanently ignore a remote branch?
  30. Line endings messed up in Git – how to track changes from another branch after a huge line ending fix?

Leave a Comment