From: Matthieu Moy <matthieu.moy@grenoble-inp.fr>
Date: Sun, 22 Nov 2009 22:09:45 GMT
Subject: Re: [PATCH 1/2] merge-recursive: point the user to commit when file would be overwritten.
Message-ID: <vpqr5rqi53q.fsf@bauges.imag.fr>
In-Reply-To: <7vskc9vzqg.fsf@alter.siamese.dyndns.org>

Junio C Hamano <gitster@pobox.com> writes:

> Matthieu Moy <Matthieu.Moy@imag.fr> writes:
>
>> The commit-before-pull is well accepted in the DVCS community, but is
>> confusing some new users. This should get them back in the right way when
>> the problem occurs.
>>
>> Signed-off-by: Matthieu Moy <Matthieu.Moy@imag.fr>
>
> Don't these extra lines warrant "advice.*" option?

I was thinking this would be overkill for a one-line advice, but it
doesn't harm to provide the option. I'll resend the patch with it
(it's not _as_ straightforward as it seems to be since the initial
structure is static in the function, but still reasonable).

-- 
Matthieu Moy
http://www-verimag.imag.fr/~moy/