Shawn Pearce wrote: > Andy Parkins <andyparkins@xxxxxxxxx> wrote: >> On Thursday 2006, December 14 21:30, Junio C Hamano wrote: >> >> > I guess that question indicates that the part of my message you >> > did not quote was not written cleanly enough. >> >> It was; I'm just stupid. >> >> Let's make the special case "linux-master" and then Linus gets what he wants >> and consistency is restored. >> >> No? Okay, I give up then. :-) > > What about we do instead: > > [branch] > mergeMessageTemplate = "Merge '%(remoteref)' from '%(remoteurl)' into '%(localref)' > %(summary)" > [branch "master"] > mergeMessageTemplate = "Merge '%(remoteref)' from '%(remoteurl)' > %(summary)" I disagree about '%(summary)' part, as it is controlled by merge.summary configuration variable. If you want per branch configuration, why not branch.<branchname>.mergesummary? By the way, the above ignores the fact, that besides having hardcoded that we don't say "into master", we have _two_ merge subject templates: one for merging from remote, one for merging from local. We might not have %(remoteurl), then what? -- Jakub Narebski Warsaw, Poland ShadeHawk on #git - To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html