Re: merge summaries

From: Junio C Hamano <junkio@cox.net>
Date: May 18, 2007, 18:47 UTC
Message-ID: <7vodki55px.fsf@assigned-by-dhcp.cox.net>
In-Reply-To: <alpine.LFD.0.98.0705181130580.3890@woody.linux-foundation.org>

Linus Torvalds <torvalds@linux-foundation.org> writes:

Show 15 quoted lines

>> I have two questions:
>> 1) Why isn't 'true' the default setting? The two probably most prominent git
>> repositories, git and kernel, both use merge summaries.
>
> Think about _who_ uses it for those two prominent repositories for a while.
>
> [ pause, ponder here ]
>
> In other words, "merge.summary" should be true ONLY FOR TOP-LEVEL 
> MAINTAINERS.
>
> Making it true for anybody else is almost always a bug. Yes, I and Junio 
> have it enabled, but pretty much nobody else should, because if they pull 
> from me or Junio in order to merge, their merge summaries would be exactly 
> the wrong way around!

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.