From: Junio C Hamano Date: Fri, 11 Dec 2009 01:11:38 GMT Subject: Re: How to selectively recreate merge state? Message-ID: <7vzl5q71rp.fsf@alter.siamese.dyndns.org> In-Reply-To: Jakub Narebski writes: > --unresolve:: > Restores the 'unmerged' or 'needs updating' state of a > file during a merge if it was cleared by accident. > > Unless "git add foo" not only adds current contents of foo at stage 0, > but also removes higher stages from index... By definition, adding anything at stage #0 is to remove higher stages.