How to tell which local branch is tracking which remote branch in Git?

Question

I would like to know if there's a way to tell which local branch is tracking which remote branch in Git.

I'm using one remote server, which is named "origin".

Jeremy Bouse · Accepted Answer · 2010-08-27 03:03:32Z

Using the example of my copy of Puppet checked out from the upstream Git repository on Github.com...

$ git remote show origin
* remote origin
  Fetch URL: git://github.com/reductivelabs/puppet.git
  Push  URL: git://github.com/reductivelabs/puppet.git
  HEAD branch: master
  Remote branches:
    0.24.x                 tracked
    0.25.x                 tracked
    2.6.x                  tracked
    master                 tracked
    next                   tracked
    primordial-ooze        tracked
    reins-on-a-horse       tracked
    testing                tracked
    testing-17-march       tracked
    testing-18-march       tracked
    testing-2-april        tracked
    testing-2-april-midday tracked
    testing-20-march       tracked
    testing-21-march       tracked
    testing-24-march       tracked
    testing-26-march       tracked
    testing-29-march       tracked
    testing-31-march       tracked
    testing-5-april        tracked
    testing-9-april        tracked
    testing4268            tracked
  Local branch configured for 'git pull':
    master merges with remote master
  Local ref configured for 'git push':
    master pushes to master (up to date)

Then if I were to execute the following:

$ git checkout -b local_2.6 -t origin/2.6.x 
Branch local_2.6 set up to track remote branch 2.6.x from origin.
Switched to a new branch 'local_2.6'

And finally re-run the git remote show origin command again I will then see the following down near the bottom:

  Local branches configured for 'git pull':
    local_2.6 merges with remote 2.6.x
    master    merges with remote master

So does this mean you can track all the remote branches in puppet although you have a few local branches. What's the many "tracked" signs mean you see in the result of the command? "tracked" by which local branch?
The remote branches are tracked in that if you do a git fetch or git pull updates to the remote branches will be tracked in your cloned repository. The local branches are just that, local branches of the remote branches and thus updates to the remote branches will be tracked and merged in when the appropriate command to do so is given. I explicitly include the '-t' option when making the local branch to ensure it tracks the branch from which it originated from. Remember a local branch can also track another local branch so doesn't have to be a remote branch.
@PJ: The term “track” has two distinct meanings in Git. The “tracked” lines in git remote show remote-name refer to “tracking branches” (snapshots of branches from remote repositories). The “merges with” lines refer to local branches that have an “upstream branch” configuration (made with with the --track/-t option of git branch or git checkout and thus often confused with “tracking branches”).

sunew · Answer 2 · 2012-02-14 16:02:04Z

up vote 41 down vote

git branch -avv

shows you all branches as well as the name of the upstream branch.

answered Feb 14 '12 at 16:02

sunew
51132

This is by far the simplest and fullest answer! – dare2be Mar 21 '12 at 10:25

2

On git version 1.7.7.5 this is showing me the local branch and the sha-1 it points to, but it doesn't show the tracked remote branch... – Mike Apr 6 '12 at 19:44

Works for me on git version 1.7.4.1 The second 'v' is required to show the remote tracking branch. – Peter Johnson Jul 25 '12 at 11:21

2

to reduce output git branch -lvv show just local branches with upstream might be useful – A.B Nov 27 '12 at 23:56

1

^git branch -vv works for me... – notacouch Mar 21 at 20:48

show 1 more comment

Chris Johnsen · Answer 3 · 2010-08-27 04:35:31Z

Jeremy Bouse illustrates how git remote show displays tracking information. That should be sufficient if you only want the information for human consumption.

If you plan on using the information in an automated context (e.g. a script) you should use the lower-level (“plumbing”) git for-each-ref instead.

% git remote show origin
* remote origin
⋮
  Local branches configured for 'git pull':
    master merges with remote master
    pu     merges with remote pu
⋮
% git for-each-ref --format='%(refname:short) <- %(upstream:short)' refs/heads
master <- origin/master
pu <- origin/pu

The git for-each-ref learned the %(upstream) token in Git 1.6.3. With earlier versions of Git you will have to extract the tracking information with git config branch.<name>.remote and git config branch.<name>.merge (probably using git for-each-ref to build the commands for each local branch name).

Your answers output is much more succinct and easier to follow, so you get the up vote :)
To make it less succinct, but provide a nice way to visually check that remote names are the same as the local branch names, a common git gotcha: in bash git for-each-ref --format=$'\n'' '' '' '' '' '' ''/%(refname:short);%(upstream:short)' refs/heads | tr ';' $'\n'

Mark Longair · Answer 4 · 2012-05-01 09:18:01Z

For a particular branch, you can use git rev-parse with the @{u} or @{upstream} suffix on the branch name, e.g.:

$  git rev-parse --symbolic-full-name master@{u}
refs/remotes/github-mhl/master

... or for the abbreviated form, add --abbrev-ref

$ git rev-parse --symbolic-full-name --abbrev-ref master@{u}
github-mhl/master

You can generally use the branch@{upstream} syntax wherever a commit is expected.

+1 Your answer gave me exactly what I needed: git rev-parse --symbolic-full-name HEAD vs. git rev-parse --symbolic-full-name HEAD@{u}, thanks!

Ingo Karkat · Answer 5 · 2012-08-01 06:38:57Z

I use the following shell script (named git-tracks) to show the remote branch that is tracked by the current branch:

#!/bin/sh -e
branch=$(git symbolic-ref HEAD)
branch=${branch##refs/heads/}
remote=$(git config "branch.${branch}.remote")
remoteBranch=$(git config "branch.${branch}.merge")
remoteBranch=${remoteBranch##refs/heads/}

echo "${remote:?}/${remoteBranch:?}"

This could also use the mentioned git for-each-ref, but I found the direct access somewhat simpler than filtering the output for the current branch.

You might consider using "set -e" at the top of the script. That will allow you to remove all of the instances of "|| exit $?" while retaining the same fail-early behavior.
@JohnWhitley: Thanks, I've edited my answer. I know about set -e, but usually stick to the explicit checking. But in this case, it's really better.

Scott Pack · Answer 6 · 2012-10-11 18:11:42Z

.git/config file also will provide the tracking branch info as

[remote "Hub"]
    url = ssh://xxxx/tmp/Hub
    fetch = +refs/heads/*:refs/remotes/Hub/*
[branch "develop"]
    remote = Hub
    merge = refs/heads/develop
[branch "Dev1"]
    remote = Test
    merge = refs/heads/Dev1
[remote "Test"]
    url = ssh://xxxx/tmp/gittesting/Dev1GIT
    fetch = +refs/heads/*:refs/remotes/Test/*

Ben Pilbrow · Answer 7 · 2012-03-07 17:33:28Z

up vote 1 down vote

Add these runes to the [alias] section of your .gitconfig file:

show-tracking = !sh -c 'git ls-remote . |grep &#x60;git log -1 --grep="git-svn-id" --format=%H&#x60;|perl -pe "s/[[:alnum:]]+[[:space:]]//"'

edited Mar 7 '12 at 17:33

Ben Pilbrow
10.1k32247

answered Mar 7 '12 at 16:48

DaveR
111

Andrew · Answer 8 · 2010-08-27 01:12:41Z

up vote 0 down vote

Try git branch with options:

 -r
List or delete (if used with -d) the remote-tracking branches. 

-a
List both remote-tracking branches and local branches.

Otherwise, examine your .git/config.

answered Aug 27 '10 at 1:12

Andrew
3,2101425

2

They show branches, but I don't understand which one is tracking which. – PJ. Aug 27 '10 at 2:42

Jarl · Answer 9 · 2013-05-07 07:50:23Z

up vote 0 down vote

git branch -vv

shows exactly what you ask for. It shows the local branches together with the corresponding remote branch they are tracking.

answered May 7 at 7:50

Jarl
1336

asked	2 years ago
viewed	38763 times
active	14 days ago

How to tell which local branch is tracking which remote branch in Git?

9 Answers

Your Answer

Not the answer you're looking for? Browse other questions tagged git or ask your own question.

Community Bulletin

How to tell which local branch is tracking which remote branch in Git?

9 Answers

Your Answer

Sign up or log in

Post as a guest

Not the answer you're looking for? Browse other questions tagged git or ask your own question.

Community Bulletin

Related