From: Junio C Hamano <gitster@pobox.com>
Date: Sat, 12 Dec 2009 09:24:27 GMT
Subject: Re: [PATCH 2/3] commit/status: "git add <path>" is not necessarily how to resolve
Message-ID: <7vbpi4v92s.fsf@alter.siamese.dyndns.org>
In-Reply-To: <20091212091556.GA30509@coredump.intra.peff.net>

Jeff King <peff@peff.net> writes:

> On Sat, Dec 12, 2009 at 01:02:02AM -0800, Junio C Hamano wrote:
>
>> When the desired resolution is to remove the path, "git rm <path>" is the
>> command the user needs to use.  Just like in "Changed but not updated"
>> section, suggest to use "git add/rm" as appropriate.
>
> I no longer even see these messages due to advice.statushints, but the
> overall direction of the series looks sane to me.
>
> However:
>
>> -	color_fprintf_ln(s->fp, c, "#   (use \"git add <file>...\" to mark resolution)");
>> +	color_fprintf_ln(s->fp, c, "#   (use \"git add/rm <file>...\" as appropriately to mark resolution)");
>
> This should be "as appropriate".

Heh, I kant speel.  Fixed and re-pushed out on 'pu'.

Thanks.