> > > > Firstly, I'll just say that (3) hasn't been true in my experience. I'm > > sure branches that are allowed to grow infinitely far apart will be hard > > to merge, but the repeated merge from 7.5->master has had the effect of > > making each individual merge very easy. In fact, it seems easier than > > cherry-picking the same number of commits, as git is able to use more > > information to resolve conflicts in the merge path. > > > > I would argue that (1) could be fixed with a smarter git commit script, > > and that > > Our git commit script already makes the thingy from the terminator movies > look > like a drunk goat, making it any smarter runs a serious risk of having it > start checking out porn. Having said that the logic in there is as follows: > if (a push has more than 100 commits) > send one email for all > else > send individual emails for all > i could try to add special paths for merge if that's desired or lower the > number of commits.
That would be a good idea -- currently we're also getting double commit messages for merges from feature branches (at least where the feature branch is also in the main repo). Keith ------------------------------------------------------------------------------ Let Crystal Reports handle the reporting - Free Crystal Reports 2008 30-Day trial. Simplify your report design, integration and deployment - and focus on what you do best, core application coding. Discover what's new with Crystal Reports now. http://p.sf.net/sfu/bobj-july _______________________________________________ Mesa3d-dev mailing list Mesa3d-dev@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/mesa3d-dev
