Subject: Re: update-index --unresolve

From: Jakub Narebski <[email-masked]>
Date: Thu, 02 Oct 2008 06:58:41 -0700 (PDT)

SZEDER Gábor <[email-masked]> writes:

> Dear All,
> 
> the documentation says following:
> 
>   --unresolve::
>          Restores the 'unmerged' or 'needs updating' state of a
>          file during a merge if it was cleared by accident.
> 
> How could I clear those states by accident (or intentionally)?

"git add <file>", or "git update-index <file>", or error in handling
merge tool via git-mergetool.

-- 
Jakub Narebski
Poland
ShadeHawk on #git