From: Andreas Schwab <schwab@suse.de>
To: Larry Finger <Larry.Finger@lwfinger.net>
Cc: John Linville <linville@tuxdriver.com>, linux-kernel@vger.kernel.org
Subject: Re: Error in git pull
Date: Tue, 11 Jul 2006 02:08:24 +0200 [thread overview]
Message-ID: <jeac7hatqf.fsf@sykes.suse.de> (raw)
In-Reply-To: <44B2D122.6010005@lwfinger.net> (Larry Finger's message of "Mon, 10 Jul 2006 17:13:54 -0500")
Larry Finger <Larry.Finger@lwfinger.net> writes:
> I just pulled your latest changes from the wireless-2.6 repository. When I
> did so, I got the following git error:
>
> finger@larrylap:~/wireless-2.6> git pull
> Unpacking 22599 objects
> 100% (22599/22599) done
> error: no such remote ref refs/heads/zd1211rw
> * refs/heads/origin: does not fast forward to branch 'master' of
> git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6;
> not updating.
>
> Is there any way for me to recover without pulling the entire tree again?
Use git reset --hard with the id of the head of the remote branch.
Andreas.
--
Andreas Schwab, SuSE Labs, schwab@suse.de
SuSE Linux Products GmbH, Maxfeldstraße 5, 90409 Nürnberg, Germany
PGP key fingerprint = 58CA 54C7 6D53 942B 1756 01D3 44D5 214B 8276 4ED5
"And now for something completely different."
prev parent reply other threads:[~2006-07-11 0:08 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2006-07-10 22:13 Error in git pull Larry Finger
2006-07-11 0:08 ` Andreas Schwab [this message]
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=jeac7hatqf.fsf@sykes.suse.de \
--to=schwab@suse.de \
--cc=Larry.Finger@lwfinger.net \
--cc=linux-kernel@vger.kernel.org \
--cc=linville@tuxdriver.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