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

Re: [PATCH 0/3] Update advice in commit/status output

From: Jay Soffian <hidden>
Date: 2016-06-15 22:47:54

Possibly related (same subject, not in this thread)

On Sat, Dec 12, 2009 at 4:02 AM, Junio C Hamano [off-list ref] wrote:
Jay Soffian noticed that we give "git reset HEAD <path>" as an instruction
to get rid of the local change that has already been added to the index
even when <path> is unmerged, or it is merged and we are about to commit a
merge.

In neither case, "git reset HEAD <path>" is absolutely a wrong thing to do
while merging.

This miniseries updates the advices given in status/commit.  It applies on
top of the jk/1.7.0-status topic, and has trivial conflicts in wt-status.c
with the jk/unwanted-advices topic that has already graduated to 'maint'.
Series looks good to me after the spelling correction. Thank you.

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