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 http://gitweb.freedesktop.org/?p=mesa/mesa.git;a=summary > > > > New commits: > > commit 72d7d2bcc34e3d26f1c4de92f1508c9ddffb3421 > > Merge: f48e055c1072ca0f3ce3096606a8d892a559c599 > > 5578f8ce3bf349107b04fb0ebb8b8d505bd9424d > > Author: Brian <[EMAIL PROTECTED]> > > Date: Mon Sep 17 12:07:29 2007 -0600 > > > > Merge branch 'softpipe_0_1_branch' of git+ssh://[EMAIL > > PROTECTED]/git/mesa/mesa into softpipe_0_1_branch > > > > commit f48e055c1072ca0f3ce3096606a8d892a559c599 > > Author: Brian <[EMAIL PROTECTED]> > > Date: Mon Sep 17 10:05:34 2007 -0600 > > > > silence warning > > > > commit 9ea91974e153858d7c0397bd78448b4be1c10c4c > > Author: Brian <[EMAIL PROTECTED]> > > Date: Mon Sep 17 10:05:21 2007 -0600 > > > > update begin/end_query() functions > > > > > OK, I think I made a git mistake. I typed 'git-push origin' instead of > 'git-push origin gallium-0.1'. > > My local gallium-0.1 repo seems to be in a funny state but I don't know > if I've messed up the central repo yet...
What happens in that case is that you push all the branches in your local repo that have matching branches in the remote repo. So, if you had any local commits in master, mesa_7_0_branch, etc., they'd all get pushed to the equivalent branches in origin. From the looks of it, you just pushed those 3 commits from your softpipe to origin/softpipe. But, it wouldn't try to do anything like merge your local softpipe to origin/master. -- Dan ------------------------------------------------------------------------- This SF.net email is sponsored by: Microsoft Defy all challenges. Microsoft(R) Visual Studio 2008. http://clk.atdmt.com/MRT/go/vse0120000070mrt/direct/01/ _______________________________________________ Mesa3d-dev mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/mesa3d-dev
