Re: how to revert changes in working tree?

From: Alex Riesen <raa.lkml@gmail.com>
Date: Dec 6, 2006, 10:20 UTC
Message-ID: <81b0412b0612060220n11fb7e19hc6ed202759962bd3@mail.gmail.com>
In-Reply-To: <45769417.70601@gmail.com>

On 12/6/06, Liu Yubao <yubao.liu@gmail.com> wrote:

Show 12 quoted lines

> Alex Riesen wrote:
> > On 12/6/06, Liu Yubao <yubao.liu@gmail.com> wrote:
> >> I'm confused how to revert changes in working tree:
> >>
> >> $ git fetch
> >> $ git merge "sync with origin" HEAD origin
> >> ....conflict....
> >
> > You may want to consider git pull. It'd do exactly the same
>
> It's said somewhere "git pull" has strange behaviour and fetch+pull
> is recommended.

So why do you use fetch+merge?

> sorry, I made a mistake, that should come from "git merge",

so, you just have an unresolved merge. It was discussed on this mailing list very recently (and actually is being discussed), so just look at the archives.

Show 10 quoted lines

> > They problem is the exec-bit which windows does not
> > have and cygwin failed to correctly workaround the
> > limitation.
> >
> > Do a "git repo-config core.filemode false" to almost
> > disable the checks for exec bit.
> >
>
> It has been set. I guess the cause is a interrupted merge
> operation that leads to textual difference.

yes, though what I can't understand is why don't you have unmerged entries... Maybe it comes from playing with all these commands you mentioned in the original mail.

> After run "git reset --hard", all deleted files come back, but I reach
> the old state:
> $ git status

When? Immediately after git reset --hard? Then you very likely have no permission to write (or lost it somehow) into the working directory, otherwise I don't see could this be possible. git reset --hard rewrites everything.

> HEAD: commit 088406bcf66d6c7fd8a5c04c00aa410ae9077403
> master: commit 088406bcf66d6c7fd8a5c04c00aa410ae9077403
> origin: commit ff51a98799931256b555446b2f5675db08de6229
> "git diff --cached" shows nothing;

which is correct.

> "git diff" shows many diffs:

and this is not. You do have changes, which could not be reset. I fail to see why. Are you sure you haven't accidentally repeated the merge after doing git reset --hard? And what was _exactly_