On Sat, Dec 12, 2009 at 4:02 AM, Junio C Hamano <gitster@xxxxxxxxx> 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. -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html