Re: [PATCH 2/3] commit/status: "git add <path>" is not necessarily how to resolve

From

Jeff King <peff@peff.net>

Date

Dec 12, 2009, 09:15 UTC

Message-ID

<20091212091556.GA30509@coredump.intra.peff.net>

In-Reply-To

<1260608523-15579-3-git-send-email-gitster@pobox.com>

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.

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".

-Peff