From: Shawn Pearce <spearce@spearce.org>
To: Andy Parkins <andyparkins@gmail.com>
Cc: git@vger.kernel.org
Subject: Re: [PATCH] "master" should be treated no differently from any other branch
Date: Thu, 14 Dec 2006 16:57:25 -0500 [thread overview]
Message-ID: <20061214215725.GA26202@spearce.org> (raw)
In-Reply-To: <200612142137.54505.andyparkins@gmail.com>
Andy Parkins <andyparkins@gmail.com> 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)"
? IOW let the user supply the merge template message in the
repository config somehow and use string placeholders like what
show-ref accepts? Then the default can be to not have the "into" at
all, and Linus surely could just set his branch.mergeMessageTemplate
to a string which gives him the message that he and his fellow
kernel hackers find to be useful?
--
next prev parent reply other threads:[~2006-12-14 21:57 UTC|newest]
Thread overview: 21+ messages / expand[flat|nested] mbox.gz Atom feed top
2006-12-14 15:19 [PATCH] "master" should be treated no differently from any other branch Andy Parkins
2006-12-14 15:29 ` Johannes Schindelin
2006-12-14 15:47 ` Han-Wen Nienhuys
2006-12-14 15:57 ` Johannes Schindelin
2006-12-14 15:59 ` Han-Wen Nienhuys
2006-12-14 16:14 ` Johannes Schindelin
2006-12-15 10:29 ` Jakub Narebski
2006-12-14 18:22 ` Nicolas Pitre
2006-12-14 16:20 ` Jerome Lovy
2006-12-15 21:55 ` Junio C Hamano
2006-12-14 16:25 ` Andy Parkins
2006-12-14 16:34 ` Andy Parkins
2006-12-14 16:39 ` Johannes Schindelin
2006-12-14 17:42 ` John W. Linville
2006-12-14 18:35 ` Robin Rosenberg
2006-12-14 20:41 ` Junio C Hamano
2006-12-14 21:23 ` Andy Parkins
2006-12-14 21:30 ` Junio C Hamano
2006-12-14 21:37 ` Andy Parkins
2006-12-14 21:57 ` Shawn Pearce [this message]
2006-12-15 10:35 ` Jakub Narebski
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20061214215725.GA26202@spearce.org \
--to=spearce@spearce.org \
--cc=andyparkins@gmail.com \
--cc=git@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).