* Error in git pull
@ 2006-07-10 22:13 Larry Finger
2006-07-11 0:08 ` Andreas Schwab
0 siblings, 1 reply; 2+ messages in thread
From: Larry Finger @ 2006-07-10 22:13 UTC (permalink / raw)
To: John Linville, linux-kernel
John,
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?
Thanks,
Larry
^ permalink raw reply [flat|nested] 2+ messages in thread
* Re: Error in git pull
2006-07-10 22:13 Error in git pull Larry Finger
@ 2006-07-11 0:08 ` Andreas Schwab
0 siblings, 0 replies; 2+ messages in thread
From: Andreas Schwab @ 2006-07-11 0:08 UTC (permalink / raw)
To: Larry Finger; +Cc: John Linville, linux-kernel
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."
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2006-07-11 0:08 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2006-07-10 22:13 Error in git pull Larry Finger
2006-07-11 0:08 ` Andreas Schwab
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox