From: Thomas Rast <trast@inf.ethz.ch>
To: Junio C Hamano <gitster@pobox.com>
Cc: Thomas Rast <trast@student.ethz.ch>, <git@vger.kernel.org>
Subject: Re: [PATCH] merge: add instructions to the commit message when editing
Date: Tue, 31 Jan 2012 08:46:04 +0100 [thread overview]
Message-ID: <87k4488gcj.fsf@thomas.inf.ethz.ch> (raw)
In-Reply-To: <7vhazcamdl.fsf@alter.siamese.dyndns.org> (Junio C. Hamano's message of "Mon, 30 Jan 2012 13:52:54 -0800")
Junio C Hamano <gitster@pobox.com> writes:
> Thomas Rast <trast@inf.ethz.ch> writes:
>
>>> Please enter the commit message for your merge commit. Explain
>>> why the merge is necessary, especially if it merges an updated
>>> upstream into a topic branch.
>>>
>>> ... because people who need to be told to "justify it" would probably be
>>> helped by a more explicit "explain _why_ it is needed".
>>
>> Why not. The "explain..." might be construed as a bit too coercive, but
>> I cannot come up with a way to defuse it (well, except again tacking on
>> "you should") ...
>
> Would "Please enter the commit message for your merge commit, to explain
> why ..." work?
Yes, though it winds up as a rather long sentence. I could then shorten
it to
Please enter a commit message that explains why the merge commit is
necessary, especially if it merges an updated upstream into a topic
branch.
though that's only _implying_ that you're completing a merge.
Your pick ;-)
--
Thomas Rast
trast@{inf,student}.ethz.ch
next prev parent reply other threads:[~2012-01-31 7:46 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-01-23 22:18 [PATCH] merge: use editor by default in interactive sessions Junio C Hamano
2012-01-23 22:27 ` Michael Haggerty
2012-01-23 22:34 ` Junio C Hamano
2012-01-30 17:06 ` Thomas Rast
2012-01-30 18:17 ` Junio C Hamano
2012-01-30 20:25 ` [PATCH] merge: add instructions to the commit message when editing Thomas Rast
2012-01-30 21:03 ` Junio C Hamano
2012-01-30 21:43 ` Thomas Rast
2012-01-30 21:52 ` Junio C Hamano
2012-01-31 7:46 ` Thomas Rast [this message]
2012-02-23 12:43 ` [PATCH] merge: use editor by default in interactive sessions Erik Faye-Lund
2012-02-23 19:23 ` Junio C Hamano
2012-02-23 20:26 ` Junio C Hamano
2012-02-23 20:31 ` Erik Faye-Lund
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=87k4488gcj.fsf@thomas.inf.ethz.ch \
--to=trast@inf.ethz.ch \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=trast@student.ethz.ch \
/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).