Re: Git workflow with upstream repository

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



On Fri, Jul 23, 2010 at 8:58 PM, Bradley Wagner
<bradley.wagner@xxxxxxxxxxxxxx> wrote:
> If I'm working with another remote repository 'upstream' that I
> perhaps don't have permissions to and then my branches are not
> tracking against, how would I do something similar to be able to first
> see how my branch compares to the remote and then either rebase or
> pull/merge.

# show the commits in my local branch that aren't in upstream
git log upstream/master..

# show the commits in upstream that aren't in my local branch
git log ..upstream/master

# a cuter way to show the commits in upstream that aren't in my local branch
git shortlog ..upstream/master

# summarize the differences in upstream since we diverged (not
including my own changes)
git diff --stat upstream/master..

# summarize the differences between my branch and upstream (including
my changes and theirs)
# (note: three dots)
git diff --stat ...upstream/master

Have fun,

Avery
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html


[Index of Archives]     [Linux Kernel Development]     [Gcc Help]     [IETF Annouce]     [DCCP]     [Netdev]     [Networking]     [Security]     [V4L]     [Bugtraq]     [Yosemite]     [MIPS Linux]     [ARM Linux]     [Linux Security]     [Linux RAID]     [Linux SCSI]     [Fedora Users]