Merge branch 'master' ??

[Eric Anholt]

On Tue, 2006-11-14 at 15:37 -0600, Jeremy C. Reed wrote:
> > >   Merge branch 'master' of git+ssh://git.freedesktop.org/git/xorg/xserver
> > > 
> > > I don't know what caused that.
> > 
> > You probably ran git-pull (which does more than people tend to expect)
> > when you already had your change committed locally.
> > 
> > > Is that a problem?
> > 
> > It is a problem (if minor) IMO because it clutters up the revision
> > history in gitk. It can be avoided using git-fetch and git-rebase
> > instead of git-pull.
> 
> Thanks for the info.
> 
> I also get:
> 
> glacier:/opt/xorg-src-git/xserver$ git push origin
> error: remote 'refs/tags/xorg-server-1_1_0' is not a strict subset of 
> local ref 'refs/tags/xorg-server-1_1_0'. maybe you are not up-to-date and 
> need to pull first?
> error: remote 'refs/tags/XORG-7_1' is not a strict subset of local ref 
> 'refs/tags/XORG-7_1'. maybe you are not up-to-date and need to pull first?

Do you have "Push: --all" in your remotes file?  If so, stop right now,
and remove that.  That's pure evil.  But maybe I'm just misinterpreting
git's behavior here and it's just noting something weird about your
repository.

As far as those two errors, see:
http://lists.freedesktop.org/archives/xorg/2006-July/016716.html

git-fetch origin +XORG-7_1 +xorg-server-1_1_0

> Now I read postings at
> 
> http://lists.freedesktop.org/archives/cairo/2006-April/006648.html
> and
> http://lists.freedesktop.org/archives/xorg/2006-October/018699.html
> 
> But still am unclear on this.
> 
> git-diff doesn't show my changes anymore. And "git-rev-list origin..HEAD" 
> shows nothing. How can I tell if my change to xserver/configure.ac was 
> committed upstream? 

git-fetch; git-log origin (are they there?)

-- 
Eric Anholt                             anholt at FreeBSD.org
eric at anholt.net                         eric.anholt at intel.com
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 187 bytes
Desc: This is a digitally signed message part
URL: <http://lists.x.org/archives/xorg/attachments/20061114/c18917a9/attachment.pgp>