From: Jeff King <peff@peff.net>
To: Neshama Parhoti <pneshama@gmail.com>
Cc: git@vger.kernel.org
Subject: Re: git push requires a subsequent git reset --hard ?
Date: Tue, 1 Jul 2008 13:19:13 -0400 [thread overview]
Message-ID: <20080701171913.GA8911@sigill.intra.peff.net> (raw)
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
next prev parent reply other threads:[~2008-07-01 17:20 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-07-01 16:51 git push requires a subsequent git reset --hard ? Neshama Parhoti
2008-07-01 17:19 ` Jeff King [this message]
2008-07-01 17:29 ` Jakub Narebski
2008-07-02 13:36 ` Dmitry Potapov
2008-07-04 13:25 ` Neshama Parhoti
2008-07-02 13:45 ` Dmitry Potapov
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=20080701171913.GA8911@sigill.intra.peff.net \
--to=peff@peff.net \
--cc=git@vger.kernel.org \
--cc=pneshama@gmail.com \
/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).