From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 11 Jul 2011 21:54:43 GMT
Subject: Re: reproducible unexpected behavior for 'git reset'
Message-ID: <7vwrfoa3fg.fsf@alter.siamese.dyndns.org>
In-Reply-To: <75BBC138-2BD7-41F9-9D84-CEFF23CDC235@johnnowak.com>

John Nowak <john@johnnowak.com> writes:

> I am able to reproduce a scenario where, after a 'commit' and a 'stash
> pop' that results in a merge conflict, I need to 'reset' a file twice in
> order to get the index back to HEAD.

Thanks, you found a bug in "git reset [<commit>] -- path" codepath, it
seems, when dealing with an unmerged path.