Re: merge summaries

From: Linus Torvalds <torvalds@linux-foundation.org>
Date: May 18, 2007, 19:13 UTC
Message-ID: <alpine.LFD.0.98.0705181206051.3890@woody.linux-foundation.org>
In-Reply-To: <7vodki55px.fsf@assigned-by-dhcp.cox.net>

On Fri, 18 May 2007, Junio C Hamano wrote:

Show 7 quoted lines

> 
> 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.

Of course, we could have some heuristics to make it possibly work well enough in practice that we could make it useful to more people:

 - take the "merge.summary" field from the "remote" description for any 
   shorthand cases, always defaulting to "off" (regardless of what the 
   "merge.summary" config value is)

   End result: "git pull origin" would never generate a merge summary, 
   unless somebody explicitly sets

	[remote "origin"]
		mergesummary = true

 - use the "merge.summary" flag only for explicitly named remotes (and 
   possibly add "--summary" so that people can choose to never do it by 
   default, but do it explicitly for when they pull from a sublieutenant)

Hmm?

		Linus