Keith Whitwell wrote: > Brian Paul wrote: >> src/mesa/drivers/x11/xm_api.c | 6 ++---- >> src/mesa/drivers/x11/xm_buffer.c | 12 ++++++++++++ >> src/mesa/main/fbobject.c | 2 -- >> src/mesa/main/framebuffer.c | 7 +++++++ >> 4 files changed, 21 insertions(+), 6 deletions(-) >> >> New commits: >> diff-tree 0af1c6b5d1e2a5560f92b93b5429f70b49449ddb (from parents) >> Merge: e69da9d02ecdf47d930276783f8b8df1a3cd99dd >> fa8961069c5a99f118deeb5c0217e7c7e1de5f1a >> Author: Brian <[EMAIL PROTECTED]> >> Date: Tue Mar 6 16:27:23 2007 -0700 >> >> Merge branch 'master' of git+ssh://[EMAIL PROTECTED]/git/mesa/mesa > > I sent an email about this a couple of hours ago, but it hasn't shown up?!? > > It'd be great to avoid these "merge branch" commits. They mess up the > revision history (as you can see with gitk) and end up adding a > significant number of no-information commits. > > It's a matter of using "git-fetch, git-rebase" instead of "git-pull" > when you have local commits. It is a poor user interface where you have > to issue two difficult-to-remember commands to do the right thing > instead of one easy command which does the wrong thing, but > unfortunately that's we've signed up to with git.
Here's a useful email elsewhere about similar headaches: http://www.winehq.org/pipermail/wine-devel/2006-July/049549.html Keith ------------------------------------------------------------------------- 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
