From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Wed, 14 Sep 2011 18:36:39 GMT
Subject: Re: Fwd: [Survey] Signed push
Message-ID: <CA+55aFyUxmPWdG1j-0t9h9g9=1MmLt7w8fdmz+dZjS=1aDgWiA@mail.gmail.com>
In-Reply-To: <7vk49bui4f.fsf@alter.siamese.dyndns.org>

On Wed, Sep 14, 2011 at 10:52 AM, Junio C Hamano <gitster@pobox.com> wrote:
> Linus Torvalds <torvalds@linux-foundation.org> writes:
>
>> Now people do "git merge" in scripts etc, so we can't fix it ;-(
>
> Yes you can, by teaching "git merge -e" to open an editor ;-).
>
> In the meantime, "commit --amend" is your friend.

The problem with both of those are human: because it's extra work,
it's not going to get done.

In contrast, if it's extra work to *avoid* editing the merge message,
people probably would see the editor pop up, and start adding a few
small notes.

That's why "default behavior" matters so much. It's not that it's not
*possible* to edit a merge message, it's that nobody ever does!

                        Linus