From: Jay Soffian Date: Sat, 12 Dec 2009 22:06:07 GMT Subject: Re: [PATCH 0/3] Update advice in commit/status output Message-ID: <76718490912121406q31ddcd12s3d813659d5096a22@mail.gmail.com> In-Reply-To: <1260608523-15579-1-git-send-email-gitster@pobox.com> On Sat, Dec 12, 2009 at 4:02 AM, Junio C Hamano wrote: > Jay Soffian noticed that we give "git reset HEAD " as an instruction > to get rid of the local change that has already been added to the index > even when is unmerged, or it is merged and we are about to commit a > merge. > > In neither case, "git reset HEAD " 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.