[PULL] fixes and clean ups for alpha

Matt Turner mattst88 at gmail.com
Tue Oct 13 18:48:10 PDT 2009


On Tue, Oct 13, 2009 at 9:42 PM, Keith Packard <keithp at keithp.com> wrote:
> Excerpts from Matt Turner's message of Tue Oct 13 18:24:49 -0700 2009:
>> Hi Keith,
>> Please pull these changes into master. I've gotten confirmation from
>> multiple users that they fix the xserver on alpha.
> Looks like it worked, but for future reference, it's probably best to
> rebase your changes to something closer to master before submitting a
> PULL request. Otherwise you risk a merge conflict, which I'll just
> bounce.


Actually before I sent the pull request I did `git pull origin master`
to verify that there were no conflicts, and when there weren't I did a
`git reset --hard HEAD^`.

Is this OK? I'm not quite sure that a better way to do it is.


More information about the xorg-devel mailing list