From: Jeff King <peff@peff.net>
Date: Tue, 01 Jul 2008 17:19:13 GMT
Subject: Re: git push requires a subsequent git reset --hard ?
Message-ID: <20080701171913.GA8911@sigill.intra.peff.net>
In-Reply-To: <912ec82a0807010951j9e970f2k9624682b33c8af7d@mail.gmail.com>

On Tue, Jul 01, 2008 at 07:51:26PM +0300, Neshama Parhoti wrote:

> On my return, I just "git push myuser@my-station:/my/git/repo" from my laptop.
> It seemed to work with no probs.
> On my station the git repo got the new commits, as I can see in
> git-log, but the actual files were left untouched.
> 
> So I need to do something like "git reset --hard HEAD" to get
> the changes into the local files.
> 
> Is that considered normal ?
> 
> or did I do something wrong ?

See:

  http://git.or.cz/gitwiki/GitFaq#head-b96f48bc9c925074be9f95c0fce69bcece5f6e73

  and

  http://git.or.cz/gitwiki/GitFaq#head-46de97a5ac549d3adf406c22674b3325ae25d09c

What you did is OK, but there is a better way to do it.

-Peff