What is a tracking branch?

by

The ProGit book has a very good explanation:

Tracking Branches

Checking out a local branch from a remote branch automatically creates what is called a tracking branch. Tracking branches are local branches that have a direct relationship to a remote branch. If you’re on a tracking branch and type git push, Git automatically knows which server and branch to push to. Also, running git pull while on one of these branches fetches all the remote references and then automatically merges in the corresponding remote branch.

When you clone a repository, it generally automatically creates a master branch that tracks origin/master. That’s why git push and git pull work out of the box with no other arguments. However, you can set up other tracking branches if you wish — ones that don’t track branches on origin and don’t track the master branch. The simple case is the example you just saw, running git checkout -b [branch] [remotename]/[branch]. If you have Git version 1.6.2 or later, you can also use the --track shorthand:

$ git checkout --track origin/serverfix
Branch serverfix set up to track remote branch refs/remotes/origin/serverfix.
Switched to a new branch "serverfix"

To set up a local branch with a different name than the remote branch, you can easily use the first version with a different local branch name:

$ git checkout -b sf origin/serverfix
Branch sf set up to track remote branch refs/remotes/origin/serverfix.
Switched to a new branch "sf"

Now, your local branch sf will automatically push to and pull from origin/serverfix.

BONUS: extra git status info

With a tracking branch, git status will tell you whether how far behind your tracking branch you are – useful to remind you that you haven’t pushed your changes yet! It looks like this:

$ git status
On branch master
Your branch is ahead of 'origin/master' by 1 commit.
  (use "git push" to publish your local commits)

or

$ git status
On branch dev
Your branch and 'origin/dev' have diverged,
and have 3 and 1 different commits each, respectively.
  (use "git pull" to merge the remote branch into yours)

More Related Contents:

  1. How can I delete all Git branches which have been merged?
  2. How can I get a list of Git branches, ordered by most recent commit?
  3. Set up git to pull and push all branches
  4. How is a tag different from a branch in Git? Which should I use, here?
  5. Rebasing a branch including all its children
  6. Vendor Branches in Git
  7. View a file in a different Git branch without changing branches
  8. How do I delete all Git branches which have been merged?
  9. Does deleting a branch in git remove it from the history?
  10. Git push: “fatal ‘origin’ does not appear to be a git repository – fatal Could not read from remote repository.”
  11. Git and working on multiple branches
  12. Commit a file to a Different Branch Without Checkout
  13. How do I force "git pull" to overwrite local files?
  14. How can I see the changes in a Git commit?
  15. Track all remote git branches as local branches
  16. Find out which remote branch a local branch is tracking
  17. Download single files from GitHub
  18. Branch descriptions in Git
  19. git – how to get default branch?
  20. What are some examples of commonly used practices for naming git branches? [closed]
  21. git shallow clone (clone –depth) misses remote branches
  22. git: Switch branch and ignore any changes without committing
  23. How to preview git-pull?
  24. Git merging within a line
  25. Branching: different config files for release/development
  26. Does git ignore empty folders?
  27. Switch branch and ignore any changes without committing
  28. main branch and ‘origin/main’ have diverged, how to ‘undiverge’ branches’?
  29. How do I create a new Git branch from an old commit? [duplicate]
  30. In git, how do I remove a commit from one branch and apply it to a different branch?

Leave a Comment