From: Mikael Magnusson <mikachu@gmail.com>
To: zsh workers <zsh-workers@zsh.org>,
Jun-ichi Takimoto <takimoto-j@kba.biglobe.ne.jp>
Subject: Re: git pull failed
Date: Thu, 9 Apr 2015 09:51:49 +0200 [thread overview]
Message-ID: <CAHYJk3RfyGxQ5asmH45s_qBw-a6b8woh00G5NmBVa6Q2b2mf+A@mail.gmail.com> (raw)
In-Reply-To: <20150409070233.GI2805@localhost.localdomain>
On Thu, Apr 9, 2015 at 9:02 AM, Han Pingtian <hanpt@linux.vnet.ibm.com> wrote:
> Hi,
>
> Today git pull failed with those message:
>
> % git pull
> remote: Counting objects: 51, done.
> remote: Compressing objects: 100% (35/35), done.
> remote: Total 35 (delta 30), reused 0 (delta 0)
> Unpacking objects: 100% (35/35), done.
> From git://git.code.sf.net/p/zsh/code
> + ca946b6...be5f561 master -> origin/master (forced update)
[...]
> What shall I do for pulling master?
I guess someone did a push -f, which they definitely should not be
doing on a public repo. You were unlucky and pulled the commit that
was since deleted. You can get back to a normal state by issuing
git reset --hard origin/master
(this will delete any committed or uncommited changes you have on the
local master branch).
--
Mikael Magnusson
next prev parent reply other threads:[~2015-04-09 7:51 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-04-09 7:02 Han Pingtian
2015-04-09 7:51 ` Mikael Magnusson [this message]
2015-04-09 16:19 ` Jun T.
2015-04-10 1:16 ` Han Pingtian
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=CAHYJk3RfyGxQ5asmH45s_qBw-a6b8woh00G5NmBVa6Q2b2mf+A@mail.gmail.com \
--to=mikachu@gmail.com \
--cc=takimoto-j@kba.biglobe.ne.jp \
--cc=zsh-workers@zsh.org \
/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.
Code repositories for project(s) associated with this public inbox
https://git.vuxu.org/mirror/zsh/
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).