From: J. Bruce Fields <bfields@fieldses.org>
Date: Fri, 18 May 2007 21:56:03 GMT
Subject: Re: merge summaries
Message-ID: <20070518215603.GS15393@fieldses.org>
In-Reply-To: <alpine.LFD.0.98.0705181206051.3890@woody.linux-foundation.org>

On Fri, May 18, 2007 at 12:13:02PM -0700, Linus Torvalds wrote:
> 
> On Fri, 18 May 2007, Junio C Hamano wrote:
> > 
> > This does not necessarily mean that your lieutenants should not
> > use merge.summary when they pull from other trees (or inside
> > their own repository to merge in the topics).  They need to
> > however disable it with --no-summary when they pull from you
> > when they choose to merge instead of rebase to adjust to the
> > updated infrastructure in your tree.
> 
> Yes, the problem is that people *will* get it wrong, so right now I'd 
> discourage people from even trying to enable merge summaries unless they 
> are the top-level maintainer.

I never quite understood what they're for--do they add any information
not already available in the history?  If not, and if people still find
them helpful anyway, then I dunno, it looks like a sign of some sort of
failure of our history display tools.

--b.