On Fri, 2007-02-02 at 11:09 +0000, Keith Whitwell wrote: > Keith Whitwell wrote: > > > > diff-tree 2ddc8799a8e243cb10cd69ea9424f72b6c4de534 (from parents) > > Merge: 47d463e954efcd15d20ab2c96a455aa16ddffdcc > > 8ebda479d90b0c95df50f790316f451a32f4bd4e > > Author: Keith Whitwell <[EMAIL PROTECTED]> > > Date: Fri Feb 2 11:06:37 2007 +0000 > > > > Merge branch 'vbo-0.2-origin' into vbo-0.2 > > Ugh. Why did that happen? > > Is there an equivalent of the choice between fetch/rebase and pull when > you are on a branch? > > Should it perhaps be: > > git-fetch > git-rebase vbo-0.2-origin > > ?
Exactly. Note that some people (such as the other Keith ;) actually seem to consider the merge commits a feature... At any rate, it's always a good idea to double-check with gitk or git-log that git-push will do what one expects. A lot of mistakes can be fixed before git-push but not afterwards. -- Earthling Michel Dänzer | http://tungstengraphics.com Libre software enthusiast | Debian, X and DRI developer ------------------------------------------------------------------------- Using Tomcat but need to do more? Need to support web services, security? Get stuff done quickly with pre-integrated technology to make your job easier. Download IBM WebSphere Application Server v.1.0.1 based on Apache Geronimo http://sel.as-us.falkag.net/sel?cmd=lnk&kid=120709&bid=263057&dat=121642 _______________________________________________ Mesa3d-dev mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/mesa3d-dev
