On Fri, 2007-04-13 at 18:18 +0200, Michel Dänzer wrote: > On Fri, 2007-04-13 at 10:06 -0600, Brian Paul wrote: > > Hmmm, I don't understand what git did here. > > > > I did a 'git pull origin' to get George's check-ins this morning. Then, > > I made a change to glxext.h, commited it and did a 'git push origin' (my > > usual routine). > > > > Now the commit message that got mailed out inludes George's changes plus > > some others that I did yesterday. Did someone do something wrong? > > It looks like you pushed your origin branch as well as your master > branch (for which there was another commit mail). This is usually due to > the git-push command line arguments or due to configuration > in .git/remotes/origin or .git/config .
Actually, it looks like Nan hai Zou created the shared origin branch (see his mail "mesa: Changes to 'origin'"). This usually happens when using git-push --all, which is a bad idea. Brian, for you it just happened because git-push pushes all branches that exist on both sides when no branch is specified explicitly on the command line or in the configuration. -- Earthling Michel Dänzer | http://tungstengraphics.com Libre software enthusiast | Debian, X and DRI developer ------------------------------------------------------------------------- Take Surveys. Earn Cash. Influence the Future of IT Join SourceForge.net's Techsay panel and you'll get the chance to share your opinions on IT & business topics through brief surveys-and earn cash http://www.techsay.com/default.php?page=join.php&p=sourceforge&CID=DEVDEV _______________________________________________ Mesa3d-dev mailing list [EMAIL PROTECTED] https://lists.sourceforge.net/lists/listinfo/mesa3d-dev
