From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 30 Jan 2012 18:17:20 GMT
Subject: Re: [PATCH] merge: use editor by default in interactive sessions
Message-ID: <7vd3a1caxb.fsf@alter.siamese.dyndns.org>
In-Reply-To: <87hazdazmb.fsf@thomas.inf.ethz.ch>

Thomas Rast <trast@student.ethz.ch> writes:

> I would suggest something like
>
> # Please enter the commit message for your merge commit.  Lines starting
> # with '#' will be ignored, and an empty message aborts the commit.
>
> or if you feel comfortable with educating the user in a
> workflow-specific way, even
>
> # Please enter the commit message for your merge commit.  You should
> # justify it especially if it merges an updated upstream into a topic
> # branch.
> # 
> # Lines starting with '#' will be ignored, and an empty message aborts
> # the commit.

Sounds like a good thing to do.
Please make it so.