All the other answers talk about "upstream" (the branch you pull from).
But a local branch can push to a different branch than the one it pulls from.
A master
might not push to the remote-tracking branch "origin/master
".
The upstream branch for master
might be origin/master
, but it could push to the remote tracking branch origin/xxx
or even anotherUpstreamRepo/yyy
.
Those are set by branch.*.pushremote
for the current branch along with the global remote.pushDefault
value.
It is that remote-tracking branch that counts when seeking unpushed commits: the one that tracks the branch at the remote
where the local branch would be pushed to.
The branch at the remote
can be, again, origin/xxx
or even anotherUpstreamRepo/yyy
.
Git 2.5+ (Q2 2015) introduces a new shortcut for that: <branch>@{push}
See commit 29bc885, commit 3dbe9db, commit adfe5d0, commit 48c5847, commit a1ad0eb, commit e291c75, commit 979cb24, commit 1ca41a1, commit 3a429d0, commit a9f9f8c, commit 8770e6f, commit da66b27, commit f052154, commit 9e3751d, commit ee2499f [all from 21 May 2015], and commit e41bf35 [01 May 2015] by Jeff King (peff
).
(Merged by Junio C Hamano -- gitster
-- in commit c4a8354, 05 Jun 2015)
Commit adfe5d0 explains:
sha1_name
: implement @{push}
shorthand
In a triangular workflow, each branch may have two distinct points of interest: the @{upstream}
that you normally pull from, and the destination that you normally push to. There isn't a shorthand for the latter, but it's useful to have.
For instance, you may want to know which commits you haven't
pushed yet:
git log @{push}..
Or as a more complicated example, imagine that you normally pull changes from origin/master
(which you set as your @{upstream}
), and push changes to your fork (e.g., as myfork/topic
).
You may push to your fork from multiple machines, requiring you to integrate the changes from the push destination, rather than upstream.
With this patch, you can just do:
git rebase @{push}
rather than typing out the full name.
Commit 29bc885 adds:
for-each-ref
: accept "%(push)
" format
Just as we have "%(upstream)
" to report the "@{upstream}
" for each ref, this patch adds "%(push)
" to match "@{push}
".
It supports the same tracking format modifiers as upstream (because you may want to know, for example, which branches have commits to push).
If you want to see how many commit your local branches are ahead/behind compared to the branch you are pushing to:
git for-each-ref --format="%(refname:short) %(push:track)" refs/heads
git log @{push}..
. See that new shortcut@{push}
(referencing the remote tracking branch you are pushing to) in my answer below – Owgit status --all
should have appeared in 2010; orgit status -v
should actually provide the verbose output that includes the extra information. – Fabre