Re: [PATCH] merge: Make merge strategy message follow the diffstat

From: Nguyen Thai Ngoc Duy <pclouds@gmail.com>
Date: Jan 13, 2012, 19:27 UTC
Message-ID: <CACsJy8BmFgssTAh=1U7JgBsGG-tSaWXQzZeODND3icXY3QUxug@mail.gmail.com>
In-Reply-To: <7vaa5rzaax.fsf_-_@alter.siamese.dyndns.org>

On Sat, Jan 14, 2012 at 2:12 AM, Junio C Hamano <gitster@pobox.com> wrote:

Show 8 quoted lines

> Paul Gortmaker <paul.gortmaker@windriver.com> writes:
>
>> By moving the message after the diffstat, there is a better chance that
>> people will be aware they've done a pointless merge commit.
>>
>> Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
>
> I think the goal of the change may be worthy

Still, diffstat from a fetch/pull is sometimes too verbose. It'd be better if we have something that fit in one screen (dirstat or maybe just a first few lines from diffstat then ellipsis) then refer users to "git diff --stat HEAD@{1}" for more detail stat.

-- 
Duy