Thanks Jose! After talking to someone who knows more about git and looking at ten or so tutorials, I was going to try rebase on the next change. Looks like that's the right thing; I don't want those merges either.
I wonder if your tip could be added to mesa3d.org, in the "Source Code Repository" section, at the bottom. I know we don't want yet another git tutorial there, but it may help people who do occasional one-offs and don't work on anything that needs its own branch. Thanks! Karl On Thu, Feb 11, 2010 at 1:02 AM, Jose Fonseca <jfons...@vmware.com> wrote: > Karl, > > When doing git pull pass the --rebase option as: > > git pull --rebase > > That will prevent these distracting tiny merges. > > There are also ways to set rebase as the default so that the --rebase option > becomes implicit, as: > > git config branch.master.rebase true > > git config --global branch.autosetuprebase=always > > Jose > > > ________________________________________ > From: mesa-commit-boun...@lists.freedesktop.org > [mesa-commit-boun...@lists.freedesktop.org] On Behalf Of Karl Schultz > [kschu...@kemper.freedesktop.org] > Sent: Wednesday, February 10, 2010 22:30 > To: mesa-com...@lists.freedesktop.org > Subject: Mesa (master): Merge branch 'master' of > git+ssh://git.freedesktop.org/git/ mesa/mesa > > Module: Mesa > Branch: master > Commit: 2717d9066d46bff9b015f3d17dc05ce1335d0883 > URL: > http://cgit.freedesktop.org/mesa/mesa/commit/?id=2717d9066d46bff9b015f3d17dc05ce1335d0883 > > Author: Karl Schultz <karl.w.schu...@gmail.com> > Date: Wed Feb 10 15:22:07 2010 -0700 > > Merge branch 'master' of git+ssh://git.freedesktop.org/git/mesa/mesa > > --- > > > > _______________________________________________ > mesa-commit mailing list > mesa-com...@lists.freedesktop.org > http://lists.freedesktop.org/mailman/listinfo/mesa-commit > > ------------------------------------------------------------------------------ > SOLARIS 10 is the OS for Data Centers - provides features such as DTrace, > Predictive Self Healing and Award Winning ZFS. Get Solaris 10 NOW > http://p.sf.net/sfu/solaris-dev2dev > _______________________________________________ > Mesa3d-dev mailing list > Mesa3d-dev@lists.sourceforge.net > https://lists.sourceforge.net/lists/listinfo/mesa3d-dev > ------------------------------------------------------------------------------ SOLARIS 10 is the OS for Data Centers - provides features such as DTrace, Predictive Self Healing and Award Winning ZFS. Get Solaris 10 NOW http://p.sf.net/sfu/solaris-dev2dev _______________________________________________ Mesa3d-dev mailing list Mesa3d-dev@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/mesa3d-dev
