Using Git how do I find changes between local and remote
Starting with Git 1.7.0, there is a special syntax that allows you to generically refer to the upstream branch: @{u}
or @{upstream}
.
To mimic hg incoming
:
git log ..@{u}
To mimic hg outgoing
:
git log @{u}..
I use the following incoming
and outgoing
aliases to make the above easier to use:
git config --global alias.incoming '!git remote update -p; git log ..@{u}'git config --global alias.outgoing 'log @{u}..'
Git can't send that kind of information over the network, like Hg can. But you can run git fetch
(which is more like hg pull
than hg fetch
) to fetch new commits from your remote servers.
So, if you have a branch called master
and a remote called origin
, after running git fetch
, you should also have a branch called origin/master
. You can then get the git log
of all commits that master
needs to be a superset of origin/master
by doing git log master..origin/master
. Invert those two to get the opposite.
A friend of mine, David Dollar, has created a couple of git shell scripts to simulate hg incoming/outgoing
. You can find them at http://github.com/ddollar/git-utils.