Thread (9 messages) 9 messages, 5 authors, 2016-06-15

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

flat view

From: Jeff King <hidden>
Date: 2016-06-15 22:47:54

Possibly related (same subject, not in this thread)

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

-Peff
Keyboard shortcuts
hback out one level
jnext message in thread
kprevious message in thread
ldrill in
Escclose help / fold thread tree
?toggle this help