Thread (4 messages) flat view 4 messages, 2 authors, 2016-06-15

Re: update-index --unresolve

From: Jakub Narebski <hidden>
Date: 2016-06-15 22:45:26

SZEDER Gábor [off-list ref] 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
Keyboard shortcuts
hback out one level
jnext message in thread
kprevious message in thread
ldrill in
Escclose help / fold thread tree
?toggle this help