git/list[1] front-page[2] threads[3] people[4] search[5] about
 

Re: update-index --unresolve

From
Jakub Narebski <jnareb@gmail.com>
Date
Oct 2, 2008, 13:58 UTC
Message-ID
<m3tzbvqesz.fsf@localhost.localdomain>
In-Reply-To
<20081002135224.GC6839@neumann>
SZEDER Gábor <szeder@ira.uka.de> writes:
Show 9 quoted lines
> 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
Previous: SZEDER GáborNext: SZEDER Gábor
Message 2 of 4 in “update-index --unresolve”
  1. SZEDER GáborOct 2, 2008
  2. Jakub NarebskiOct 2, 2008
  3. SZEDER GáborOct 2, 2008
  4. SZEDER GáborOct 2, 2008

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.