Thread (10 messages) flat view 10 messages, 5 authors, 2016-06-15

Re: merge summaries

From: J. Bruce Fields <hidden>
Date: 2016-06-15 22:43:11

Possibly related (same subject, not in this thread)

On Fri, May 18, 2007 at 12:13:02PM -0700, Linus Torvalds wrote:
On Fri, 18 May 2007, Junio C Hamano wrote:
quoted
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.
Keyboard shortcuts
hback out one level
jnext message in thread
kprevious message in thread
ldrill in
Escclose help / fold thread tree
?toggle this help