Messages in this thread | | | From | Andreas Schwab <> | Subject | Re: Error in git pull | Date | Tue, 11 Jul 2006 02:08:24 +0200 |
| |
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." - To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
| |