Re: [Mesa3d-dev] mesa: Changes to 'softpipe_0_1_branch'

2008-01-24 Thread Brian Paul
Brian Paul wrote: src/mesa/drivers/x11/xm_dd.c |8 src/mesa/state_tracker/st_atom_constbuf.c |1 + 2 files changed, 5 insertions(+), 4 deletions(-) commit diffs at http://gitweb.freedesktop.org/?p=mesa/mesa.git;a=summary New commits: commit

Re: [Mesa3d-dev] mesa: Changes to 'softpipe_0_1_branch'

2008-01-24 Thread Dan Nicholson
On Jan 24, 2008 2:54 PM, Brian Paul [EMAIL PROTECTED] wrote: Brian Paul wrote: src/mesa/drivers/x11/xm_dd.c |8 src/mesa/state_tracker/st_atom_constbuf.c |1 + 2 files changed, 5 insertions(+), 4 deletions(-) commit diffs at

Re: [Mesa3d-dev] mesa: Changes to 'softpipe_0_1_branch'

2008-01-24 Thread Brian Paul
Dan Nicholson wrote: On Jan 24, 2008 2:54 PM, Brian Paul [EMAIL PROTECTED] wrote: Brian Paul wrote: src/mesa/drivers/x11/xm_dd.c |8 src/mesa/state_tracker/st_atom_constbuf.c |1 + 2 files changed, 5 insertions(+), 4 deletions(-) commit diffs at

Re: [Mesa3d-dev] mesa: Changes to 'softpipe_0_1_branch'

2008-01-24 Thread Dan Nicholson
On Jan 24, 2008 3:16 PM, Brian Paul [EMAIL PROTECTED] wrote: Is there some kind of git-reset that'll restore my repo to the state before the accidental push? I've shot myself in the foot with git-reset in the past and usually recover rm'ing the repo and starting over. It's kind of hard to

Re: [Mesa3d-dev] mesa: Changes to 'softpipe_0_1_branch'

2008-01-24 Thread Brian Paul
Eric Anholt wrote: On Thu, 2008-01-24 at 16:16 -0700, Brian Paul wrote: OK, I think I just made a mess locally. When I try to do a git-fetch, git-rebase origin/gallium-0.1, I get the following: $ git-rebase origin/gallium-0.1 First, rewinding head to replay your work on top of it...