[Xquartz-dev] odd hang with NDEBUG
Ben Byer
bbyer at apple.com
Fri Nov 30 19:25:03 PST 2007
On Nov 30, 2007, at 3:25 PM, Jeremy Huddleston wrote:
>
> On Nov 30, 2007, at 09:15, Ben Byer wrote:
>> Hrm. xorg-config, or dix-config? I was eventually told that xorg-
>> config was really supposed to just be for, well, stuff that didn't
>> fall into its own DDX (like Darwin) -- so we should be using dix-
>> whatever instead of xorg-whatever.
>
> yep, I did that change Wednesday night, I think.
>
> BTW, "Merge branch 'xorg-server-1.2-apple' of ssh://
> git.freed ..." ... use git-fetch and git-rebase instead of pull
>
> I gave some helpful aliases for this here: http://trac.macosforge.org/projects/xquartz/wiki/DeveloperInfo#RemoteChanges
I know; I have this set up:
alias gitpull='git fetch; git-rebase origin/xorg-server-1.2-apple'
... but it doesn't seem to work. So, I gritted my teeth and just did
"pull". :/
--
Ben Byer
CoreOS / BSD Technology Group, XDarwin maintainer
More information about the Xquartz-dev
mailing list