From: Jakub Narebski <jnareb@gmail.com>
To: "SZEDER Gábor" <szeder@ira.uka.de>
Cc: git@vger.kernel.org
Subject: Re: update-index --unresolve
Date: Thu, 02 Oct 2008 06:58:41 -0700 (PDT) [thread overview]
Message-ID: <m3tzbvqesz.fsf@localhost.localdomain> (raw)
In-Reply-To: <20081002135224.GC6839@neumann>
SZEDER Gábor <szeder@ira.uka.de> 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
next prev parent reply other threads:[~2008-10-02 13:59 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-10-02 13:52 update-index --unresolve SZEDER Gábor
2008-10-02 13:58 ` Jakub Narebski [this message]
2008-10-02 14:18 ` SZEDER Gábor
2008-10-02 14:25 ` SZEDER Gábor
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=m3tzbvqesz.fsf@localhost.localdomain \
--to=jnareb@gmail.com \
--cc=git@vger.kernel.org \
--cc=szeder@ira.uka.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).